From 5184ced8c8e0a65ca1398644e7d82e7d45e2778e Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 19 Jun 2021 16:41:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=E5=85=8D=E7=96=ABbuff=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Buff.lua | 6 +++--- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua index 8859bf7f93..2130d9be3e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua @@ -242,13 +242,13 @@ function BuffManager:ClearBuff(target, func) while idx <= list.size do local buff = list.buffer[idx] if buff.target == target and (not func or (func and buff.clear and func(buff))) then - if func and func(buff) then + -- if func and func(buff) then if buff.type== BuffName.Shield then buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Shield) - elseif buff.type== BuffName.DOT or buff.type==BuffName.Control or buff.type==BuffName.Immune then + elseif buff.type== BuffName.DOT or buff.type==BuffName.Control then buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear) end - end + -- end buff:OnEnd() buff.target.Event:DispatchEvent(BattleEventName.BuffEnd, buff) putBuff(buff) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 6f68666d5d..4226fe072c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -5708,7 +5708,7 @@ local passivityList = { BattleUtil.RandomAction(pro, function() BattleLogic.BuffMgr:ClearBuff(defRole, function(buff) if buff.type == BuffName.Immune and (buff.immuneType == 4 or buff.immuneType == 2) then - -- buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear) + buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear) return true end return false From 15361c2ef5d3f6c8ac135d725e19a8fe94f8ab91 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 19 Jun 2021 17:07:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=A7=E5=9C=A3=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 2 ++ Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 21d69c683e..6b7d3f8fe3 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1042,6 +1042,8 @@ JumpType = { SheJiDaDianShangDian = 20060, --社稷大典商店 XinJiangLaiXiShangDian = 20200, --社稷大典商店 XingChenShangDian = 20059, --星辰商店 + + ChaoFanRuSheng = 20061, } NPCPosType={ diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 21dfd80cc2..229361386f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -666,6 +666,9 @@ local jumpDic = { [JumpType.EndlessXingDongliBuy] = function(data) UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = 1 }) end, + [JumpType.ChaoFanRuSheng] = function(data) + this.JumpActivity(ActivityTypeDef.ChaoFanRuSheng,data[1]) + end, } function this.JumpActivity(data,skipfactor) From f4fe1555337b120970ecfa8b1be700080b94091d Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 19 Jun 2021 17:47:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=A7=E5=9C=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/NewActivity/UpStarPre.prefab | 8 ++++---- .../~Lua/Modules/DynamicActivity/ActivityMainPanel.lua | 3 +++ .../~Lua/Modules/Map/View/EndLessMapView.lua | 3 +++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab index 6c210a8276..c1fbcaa1fc 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab @@ -129,7 +129,7 @@ RectTransform: 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: -209.615, y: 71.95} + m_AnchoredPosition: {x: -199.25002, y: 71.95} m_SizeDelta: {x: 0, y: 144} m_Pivot: {x: 0, y: 1.0000001} --- !u!114 &8585533787268794185 @@ -159,7 +159,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 27 + m_Left: 3 m_Right: 0 m_Top: 0 m_Bottom: 0 @@ -15432,8 +15432,8 @@ RectTransform: 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: 48.62, y: -0.049988} - m_SizeDelta: {x: 419.23, y: 144.1} + m_AnchoredPosition: {x: 59, y: -0.049988} + m_SizeDelta: {x: 398.5, y: 144.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2850623819429736862 MonoBehaviour: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index d9efbbb52f..d9abee3b31 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -286,6 +286,9 @@ end --界面关闭时调用(用于子类重写) function ActivityMainPanel:OnClose() + if UIManager.IsOpen(UIName.RewardItemSingleShowPopup) then + UIManager.ClosePanel(UIName.RewardItemSingleShowPopup) + end --清除红点 for k,v in pairs(redPointTypeList) do ClearRedPointObject(k,v) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index aad0358e5c..6fdee688b5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -785,6 +785,9 @@ function EndLessMapView:OnClose() if UIManager.IsOpen(UIName.HelpPopup) then UIManager.ClosePanel(UIName.HelpPopup) end + if UIManager.IsOpen(UIName.ShowEnemyInfoPanel) then + UIManager.ClosePanel(UIName.ShowEnemyInfoPanel) + end end function EndLessMapView:OnDestroy() From 46efd9b960f6378bbf25d464b41b8fb0af69a16b Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 19 Jun 2021 17:50:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=B8=AE=E5=8A=A9?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/ActivityMainPanel.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index d9abee3b31..a25dde21e3 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -289,6 +289,9 @@ function ActivityMainPanel:OnClose() if UIManager.IsOpen(UIName.RewardItemSingleShowPopup) then UIManager.ClosePanel(UIName.RewardItemSingleShowPopup) end + if UIManager.IsOpen(UIName.HelpPopup) then + UIManager.ClosePanel(UIName.HelpPopup) + end --清除红点 for k,v in pairs(redPointTypeList) do ClearRedPointObject(k,v)