From 4cb31b3ba097f25abfc5c223cee424a0913fd145 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 14 Dec 2021 10:05:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E6=A3=AE=E7=BD=97=E5=B9=BB?= =?UTF-8?q?=E5=A2=83=E3=80=91=E4=BF=AE=E5=A4=8D=E8=8B=B1=E9=9B=84=E9=80=89?= =?UTF-8?q?=E6=A1=86=E5=BA=95=E5=9B=BE=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab index 67f4e5d9d8..4d564a5ba0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab @@ -104973,7 +104973,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6874390154766067829} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: From 55f324445ec2f966205e876c15c2af9f5ac78fce Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 14 Dec 2021 10:07:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E6=9C=88=E5=8D=A1=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=97=B6=E6=BF=80=E6=B4=BB=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua index 660a40a287..300e3386c5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua @@ -30,7 +30,6 @@ function this.UpdateMonthCardData(msg) for i = 1, #msg.monthinfos do if monthCardData[i].endingTime <= 0 and msg.monthinfos[i].endingTime > 0 then this.showStr = string.format("恭喜您成功激活%s功能,是否立即前往月卡界面领取奖励。", MonthCardText[i])--Language[11384] - break end end monthCardData = {} From 1691fd03da4fb533871bb59e61ed9c158b752660 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 14 Dec 2021 13:51:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BA=AB=E5=A4=96=E5=8C=96=E8=BA=ABcasting?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/View/Unit/BattleUnit.lua | 8 ++++++++ .../Modules/Battle/View/Unit/MonsterView.lua | 12 ++++++++---- .../Modules/Battle/View/Unit/SkillCaster.lua | 18 +++++++++++------- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua index d942d0ff7b..c3f48c1729 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua @@ -35,6 +35,14 @@ end --++++++++++++++DelayFunc 延迟执行方法 function BattleUnit:DelayFunc(time, func) + -- 判断是否需要延时 + if not time or time <= 0 then + if func then + func() + end + return + end + -- if not self._DelayFuncList then self._DelayFuncList = {} end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua index 60434820bc..2926430d43 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua @@ -144,9 +144,6 @@ end -- 播放动画 function MonsterView:PlaySpineAnim(gog, time, name, isLoop) - if self.isMainPlayer then - name = "idle" - end if isLoop then gog.AnimationState:SetAnimation(time, name, isLoop) else @@ -262,8 +259,15 @@ function MonsterView:OnSkillCastingStart(skill) coroutine.wait(0.1) self.turnEffect:SetActive(true) end) + + -- 延长Casting时间 + return 0.6 else - self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "attack" , false) + if self.isMainPlayer then + self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "idle" , false) + else + self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "attack" , false) + end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua index 0b852e739b..377261690f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua @@ -135,17 +135,21 @@ function SkillCaster:PlaySkillCastingEffect(combat, skill, func) self.owner:OnSkillCastStart(skill) end -- 调用上层接口 + local _ExtraTime if self.owner.OnSkillCastingStart then - self.owner:OnSkillCastingStart() + _ExtraTime = self.owner:OnSkillCastingStart() end + _ExtraTime = _ExtraTime or 0 self.owner:DelayFunc(2, function() - self.castingEfectNode:SetActive(false) - - -- 调用上层接口 - if self.owner.OnSkillCastingEnd then - self.owner:OnSkillCastingEnd() - end + -- 判断是否要额外增加casting显示时间 + self.owner:DelayFunc(_ExtraTime, function () + self.castingEfectNode:SetActive(false) + -- 调用上层接口 + if self.owner.OnSkillCastingEnd then + self.owner:OnSkillCastingEnd() + end + end) if func then func() func = nil end end)