From 7387023dfeae1910cfd6467d911f12ba52355d8a Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 31 May 2021 17:33:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E9=80=9A=E5=85=B3=E6=98=9F=E7=BA=A7=E6=9D=A1=E4=BB=B6=20?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=80=BB=E8=BE=91=204=20=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/HardStageCondition.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua index 510ec30e4e..b71a0434f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua @@ -33,8 +33,12 @@ local _ConditionConfig = { local v2 = condition[2] local record = HardStageEventManager.GetRoundDamageRecord() if record then - if record[v1] and record[v1] >= v2 then - return 1 + if record then + for key, value in pairs(record) do + if key<=v1 and value>=v2 then + return 1 + end + end end end return 0 From 78a6fe54d8d9f6a7259cb12478936b11cd0ef031 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 31 May 2021 17:39:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E5=A4=A7=E9=97=B9=E5=A4=A9?= =?UTF-8?q?=E5=AE=AB=E3=80=91=E9=87=8D=E7=BD=AE=E9=98=B6=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E4=B8=BB=E5=9F=8E=E4=B9=9F=E4=BC=9A=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Expedition/ExpeditionManager.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 73f76bc289..64ab561b00 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -484,9 +484,11 @@ function this.RefreshPanelShowByState() if ExpeditionManager.ExpeditionPanelIsOpen == 1 and UIManager.IsOpen(UIName.ExpeditionMainPanel) then --not UIManager.IsOpen(UIName.BattlePanel) then PlayerManager.carbonType = 1 if ExpeditionManager.ExpeditionState == 2 then + UIManager.ClosePanel(UIName.ExpeditionMainPanel) UIManager.OpenPanel(UIName.CarbonTypePanelV2) PopupTipPanel.ShowTip(Language[12183]) elseif ExpeditionManager.ExpeditionState == 3 then + UIManager.ClosePanel(UIName.ExpeditionMainPanel) UIManager.OpenPanel(UIName.CarbonTypePanelV2) PopupTipPanel.ShowTip(Language[12183]) end From 9ebd4c5e05e7a1bd91e75fe38a45326528ad6012 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 31 May 2021 18:00:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E5=BF=83=E6=84=BF=E6=8A=BD?= =?UTF-8?q?=E5=8D=A1=E3=80=91=E6=B8=B8=E6=88=8F=E9=87=8C=E9=81=93=E5=85=B7?= =?UTF-8?q?=E5=AF=BB=E4=BB=99=E7=8E=89=E8=B7=B3=E8=BD=AC=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E9=99=90=E6=97=B6=E5=95=86=E5=B8=82=EF=BC=8C=E8=B7=B3=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E6=B4=BB=E5=8A=A8=E4=B8=BB=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 2 +- .../DynamicActivity/ActivityMainPanel.lua | 20 +++++++++++++------ .../~Lua/Modules/Player/JumpManager.lua | 7 ++++++- .../Popup/RewardItemSingleShowPopup.lua | 1 + 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 0e52a94d9a..0ac4482578 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1031,7 +1031,7 @@ JumpType = { XiangYaoDuoBao = 10020,--降妖夺宝 HeadChange = 10021, --巅峰赛 XianShiDuiHuan = 10022, --主题活动限时兑换 - ZhuTiHuoDong = 20000, + ZhuTiHuoDong = 20000, --主题活动任务 QianKunShangDian = 20044, --乾坤商店 SheJiDaDianShangDian = 20060, --社稷大典商店 XinJiangLaiXiShangDian = 20200, --社稷大典商店 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 13f128257a..243b2db15c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -67,8 +67,16 @@ function ActivityMainPanel:CheckActOpen(_index) if tabs[_index].IfBack == 1 then if tabs[_index].ActiveType > 0 then local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType) - if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) and (tabs[_index].ActiveType == ActivityTypeDef.DynamicAct or not GlobalActConfig[id].ShowArt or GlobalActConfig[id].ShowArt < 1 or GlobalActConfig[id].ShowArt == this.activityType) then - _CurPageIndex = _index + if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) then + if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then + if tabs[_index].ActiveType == ActivityTypeDef.DynamicAct then + _CurPageIndex = _index + elseif GlobalActConfig[id].ShowArt == this.activityType then + _CurPageIndex = _index + end + else + _CurPageIndex = _index + end end elseif tabs[_index].FunType > 0 then if ActTimeCtrlManager.SingleFuncState(tabs[_index].FunType) then @@ -96,12 +104,12 @@ end --界面打开时调用(用于子类重写) function ActivityMainPanel:OnOpen(_activityType,_index) SoundManager.PlaySound(SoundConfig.UI_Hddakai) - LogGreen("this.activityType:"..tostring(this.activityType).." _index:"..tostring(_index)) + Log("this.activityType:"..tostring(this.activityType).." _index:"..tostring(_index)) this.activityType = _activityType DynamicActivityManager.curActivityType = this.activityType tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType) _CurPageIndex = 0 - LogGreen("_index:"..tostring(_index)) + Log("#tabs:"..tostring(#tabs).." _index:"..tostring(_index)) if _index and _index > 0 then self:CheckActOpen(_index) end @@ -120,9 +128,9 @@ function ActivityMainPanel:OnOpen(_activityType,_index) end) else this:ClosePanel() - end + end end - LogGreen("_CurPageIndex:".._CurPageIndex) + Log("_CurPageIndex:".._CurPageIndex) end -- 打开,重新打开时回调 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 1bc14c6da8..ca14fbf4a1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -602,7 +602,12 @@ local jumpDic = { end end, [JumpType.TimeLimiteCall] = function (data) - this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) + if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitUpHero) then + this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) + else + ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) + this.JumpActivity(JumpType.ZhuTiHuoDong,data[2]) + end end, [JumpType.QianKunBox] = function (data) this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 65d6f014d6..0bae3eeab0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -202,6 +202,7 @@ function RewardItemSingleShowPopup:BindEvent() end elseif itemConfigData then JumpManager.GoJump(itemConfigData.UseJump,function () + Log("UseJump:"..tostring(itemConfigData.UseJump)) this:ClosePanel() end) end From db6f172f704232db032a316606cc4561ef104ebc Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 31 May 2021 18:01:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E6=98=BE=E7=A4=BA=E6=8A=BD=E5=8D=A1?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8]=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=E5=B8=B8?= =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 0e52a94d9a..356e2083c6 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2083,8 +2083,8 @@ RecruitType = { XiangYaoSingle = 48, --降妖夺宝单抽 XiangYaoTen = 49, --降妖夺宝十连 - PrayerSingle = 44, --限时召唤单抽 - PrayerTen = 45, --限时召唤十连 + PrayerSingle = 50, --限时召唤单抽 + PrayerTen = 51, --限时召唤十连 } ItemBaseType = { Special = 1, --特殊