From 5c4e04a1be90a02a88d20fc41322c7c02f53aaa3 Mon Sep 17 00:00:00 2001 From: xiejun <467745540@qq.com> Date: Tue, 19 Sep 2023 18:56:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/View/Unit/SkillCaster.lua | 67 ++++++++++--------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua index 5b49fd712a..d892dc300e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua @@ -263,35 +263,35 @@ end --横版需要改动 local FullEffectPosition = { - My_All = Vector3.New(0, -566, 0), - My_Front = Vector3.New(-120, -410, 0), - My_Behind = Vector3.New(20, -760, 0), - My_COL_1 = Vector3.New(-300, -566, 0), - My_COL_2 = Vector3.New(0, -566, 0), - My_COL_3 = Vector3.New(300, -566, 0), - - - Enemy_All = Vector3.New(0, 430, 0), - Enemy_Front = Vector3.New(-100, 340, 0), - Enemy_Behind = Vector3.New(50, 540, 0), - Enemy_COL_1 = Vector3.New(-300, 430, 0), - Enemy_COL_2 = Vector3.New(0, 430, 0), - Enemy_COL_3 = Vector3.New(300, 430, 0), - - -- My_All = Vector3.New(-300, 0, 0), - -- My_Front = Vector3.New(-120, 0, 0), - -- My_Behind = Vector3.New(20, 0, 0), + -- My_All = Vector3.New(0, -566, 0), + -- My_Front = Vector3.New(-120, -410, 0), + -- My_Behind = Vector3.New(20, -760, 0), -- My_COL_1 = Vector3.New(-300, -566, 0), -- My_COL_2 = Vector3.New(0, -566, 0), -- My_COL_3 = Vector3.New(300, -566, 0), - -- Enemy_All = Vector3.New(50, 0, 0), - -- Enemy_Front = Vector3.New(0, 0, 0), - -- Enemy_Behind = Vector3.New(150,0 , 0), - -- Enemy_COL_1 = Vector3.New(-50, 0, 0), - -- Enemy_COL_2 = Vector3.New(0, 0, 0), - -- Enemy_COL_3 = Vector3.New(50, 0, 0), + -- Enemy_All = Vector3.New(0, 430, 0), + -- Enemy_Front = Vector3.New(-100, 340, 0), + -- Enemy_Behind = Vector3.New(50, 540, 0), + -- Enemy_COL_1 = Vector3.New(-300, 430, 0), + -- Enemy_COL_2 = Vector3.New(0, 430, 0), + -- Enemy_COL_3 = Vector3.New(300, 430, 0), + + My_All = Vector3.New(-300, 0, 0), + My_Front = Vector3.New(-120, 0, 0), + My_Behind = Vector3.New(20, 0, 0), + My_COL_1 = Vector3.New(-300, -566, 0), + My_COL_2 = Vector3.New(0, -566, 0), + My_COL_3 = Vector3.New(300, -566, 0), + + + Enemy_All = Vector3.New(50, 0, 0), + Enemy_Front = Vector3.New(0, 0, 0), + Enemy_Behind = Vector3.New(150,0 , 0), + Enemy_COL_1 = Vector3.New(-50, 0, 0), + Enemy_COL_2 = Vector3.New(0, 0, 0), + Enemy_COL_3 = Vector3.New(50, 0, 0), } function SkillCaster:GetEffectSPostion(skill) local chooseId = skill:GetDirectChooseId() @@ -319,13 +319,13 @@ function SkillCaster:GetEffectPosition(skill) if chooseLimit == 0 or chooseLimit == 4 or chooseLimit == 5 then return targetCamp == 0 and FullEffectPosition.My_All or FullEffectPosition.Enemy_All - elseif chooseLimit == 1 or chooseLimit == 2 then + elseif chooseLimit == 1 or chooseLimit == 2 then --前排,后排 if targetCamp == 0 then return targetPos <= 3 and FullEffectPosition.My_Front or FullEffectPosition.My_Behind else return targetPos <= 3 and FullEffectPosition.Enemy_Front or FullEffectPosition.Enemy_Behind end - elseif chooseLimit == 3 then + elseif chooseLimit == 3 then --队列 local col = (targetPos-1) % 3 + 1 return targetCamp == 0 and FullEffectPosition["My_COL_"..col] or FullEffectPosition["Enemy_COL_"..col] end @@ -673,12 +673,13 @@ function SkillCaster:CheckFullSceenSkill(combat, skill,skillduration) -- end) - -- 判断是否震屏 - -- if combat.ShockScreen == 1 then - -- self.owner:DelayFunc((combat.KeyFrame + combat.DamageDelay)/1000, function() - -- self:checkShake(combat) - -- end) - -- end + -- 判断是否震屏 + -- bulletTime + + if combat.ShockScreen == 1 then + self.owner:DelayFunc((combat.KeyFrame + combat.DamageDelay)/1000, function() + self:checkShake(combat) + end) + end end function SkillCaster:CalRoleRotate(baseRole, targetRole) @@ -881,7 +882,7 @@ function SkillCaster:RoleViewBullet(combat, target) if compnet~=nil then --compnet.transform.localScale = Vector3.one * 3 -- compnet.transform.sizeDelta = Vector2.New(1000, 1000) - self.owner:PlaySpineAnim (compnet,0,"animation",true) + self.owner:PlaySpineAnim (compnet,0,"attack",true) end -- go.transform.localPosition = startPos