From 76c682eb684d76305c427119cbd9601f5504277d Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 20 Dec 2021 12:05:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E7=A5=9E=E5=B0=86=E5=9B=9E?= =?UTF-8?q?=E9=80=80=E3=80=91=E5=B0=86=E9=AD=82=E8=B6=B3=E5=A4=9F=E5=8D=87?= =?UTF-8?q?=E6=98=9F=E6=97=B6=EF=BC=8C=E8=BF=9B=E9=98=B6=E9=A1=B5=E7=AD=BE?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Hero/HeroManager.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index e20f9d5d88..989a70b802 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3137,12 +3137,15 @@ function this.IsShowUpStarRedPoint(curHeroData,isNoDeleFormation)--isNoDeleForma upStarMaterialIsAll[curSelectUpStarData.upStarData[2]] = 2 if #upStarHeroListData.heroList >= curSelectUpStarData.upStarData[4] then for j = 1, #upStarHeroListData.heroList do - if upStarHeroListData.heroList[j].lockState == 0 and + LogGreen("upStarHeroListData.heroList[j].type:"..upStarHeroListData.heroList[j].type) + LogGreen("upStarHeroListData.heroList[j].dynamicId:"..tostring(upStarHeroListData.heroList[j].dynamicId)) + if (upStarHeroListData.heroList[j].type == RoleUpStarMatType.hero and upStarHeroListData.heroList[j].lockState == 0 and (upStarHeroListData.heroList[j].isFormation == "" or isNoDeleFormation) and #curSelectHeroList < curSelectUpStarData.upStarData[4] and not upStarConsumeMaterial[upStarHeroListData.heroList[j].dynamicId] and not HarmonyManager.IsChangeColor(upStarHeroListData.heroList[j].dynamicId) and - not (HarmonyManager:IsEnvoy(upStarHeroListData.heroList[j].dynamicId) and HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) and HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).heroTid == 0) + not (HarmonyManager:IsEnvoy(upStarHeroListData.heroList[j].dynamicId) and HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) and HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).heroTid == 0)) + or upStarHeroListData.heroList[j].type == RoleUpStarMatType.item then table.insert(curSelectHeroList, upStarHeroListData.heroList[j]) end @@ -3151,7 +3154,9 @@ function this.IsShowUpStarRedPoint(curHeroData,isNoDeleFormation)--isNoDeleForma upStarMaterialIsAll[curSelectUpStarData.upStarData[2]] = 1 end for _i, v in pairs(curSelectHeroList) do - upStarConsumeMaterial[v.dynamicId] = v.dynamicId + if v.dynamicId then + upStarConsumeMaterial[v.dynamicId] = v.dynamicId + end end end --end From f306f0141d793a7894618fab111ff2fbcbfba730 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 20 Dec 2021 12:55:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=A0=E9=99=A4log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 989a70b802..2e1848a8e3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3137,8 +3137,6 @@ function this.IsShowUpStarRedPoint(curHeroData,isNoDeleFormation)--isNoDeleForma upStarMaterialIsAll[curSelectUpStarData.upStarData[2]] = 2 if #upStarHeroListData.heroList >= curSelectUpStarData.upStarData[4] then for j = 1, #upStarHeroListData.heroList do - LogGreen("upStarHeroListData.heroList[j].type:"..upStarHeroListData.heroList[j].type) - LogGreen("upStarHeroListData.heroList[j].dynamicId:"..tostring(upStarHeroListData.heroList[j].dynamicId)) if (upStarHeroListData.heroList[j].type == RoleUpStarMatType.hero and upStarHeroListData.heroList[j].lockState == 0 and (upStarHeroListData.heroList[j].isFormation == "" or isNoDeleFormation) and #curSelectHeroList < curSelectUpStarData.upStarData[4] and From 84e181ef1a970dc3264454949412a5bfa00b4974 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 20 Dec 2021 13:07:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?ID1010877=E3=80=91=20=E3=80=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E8=B7=B3=E8=BF=87=E6=8F=90=E7=A4=BA=E6=96=87?= =?UTF-8?q?=E5=AD=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 29e6ce9b0f..b57ca1b4c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -857,7 +857,7 @@ end -- 是否解锁跳过功能 function this.IsUnlockBattlePass() -- return false - return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值任意金额后解锁" + return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值任意金额后解锁跳过" end -- 战斗暂停控制 From 7002f1ac429a0c1f36bfb68608dc050edc7f16b1 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 20 Dec 2021 13:10:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=85=B3=E5=8D=A1=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Fight/FightPointPassMainPanel.prefab | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 6b505857a9..450b322c25 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -4865,7 +4865,7 @@ ParticleSystem: --- !u!199 &325797788 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9657,7 +9657,7 @@ ParticleSystem: --- !u!199 &689865173 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10151,7 +10151,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.86274517, g: 0.6901961, b: 0.48235297, a: 1} + m_Color: {r: 0.94509804, g: 0.9137255, b: 0.78431374, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -10160,7 +10160,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -15726,7 +15726,7 @@ ParticleSystem: --- !u!199 &1640369986 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20665,7 +20665,7 @@ ParticleSystem: --- !u!199 &2023267969 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25786,7 +25786,7 @@ ParticleSystem: --- !u!199 &53865032735354669 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30637,7 +30637,7 @@ ParticleSystem: --- !u!199 &53865032903479894 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35372,7 +35372,7 @@ ParticleSystem: --- !u!199 &53865033217178009 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39985,7 +39985,7 @@ ParticleSystem: --- !u!199 &53865033315684810 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -42851,7 +42851,7 @@ MonoBehaviour: --- !u!199 &2029503781167846324 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -52617,7 +52617,7 @@ ParticleSystem: --- !u!199 &6880421793403083728 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -58381,7 +58381,7 @@ ParticleSystem: --- !u!199 &4461638917069206421 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -63819,7 +63819,7 @@ ParticleSystem: --- !u!199 &3013323903669708406 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -68583,7 +68583,7 @@ ParticleSystem: --- !u!199 &3013323904051820469 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -73155,7 +73155,7 @@ ParticleSystem: --- !u!199 &3013323905367474027 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -80633,7 +80633,7 @@ ParticleSystem: --- !u!199 &4464147961387653562 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -85336,7 +85336,7 @@ ParticleSystem: --- !u!199 &4464147961555461313 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90219,7 +90219,7 @@ ParticleSystem: --- !u!199 &4464147961868422926 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94906,7 +94906,7 @@ ParticleSystem: --- !u!199 &4464147962235348829 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -100715,7 +100715,7 @@ ParticleSystem: --- !u!199 &6988990775388982249 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -106820,7 +106820,7 @@ ParticleSystem: --- !u!199 &1454073279585546898 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -111797,7 +111797,7 @@ ParticleSystem: --- !u!199 &6133679773105218358 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -116691,7 +116691,7 @@ ParticleSystem: --- !u!199 &6133679773792227019 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -121357,7 +121357,7 @@ ParticleSystem: --- !u!199 &6133679774607836274 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -126237,7 +126237,7 @@ ParticleSystem: --- !u!199 &7281689276397397565 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -131623,7 +131623,7 @@ ParticleSystem: --- !u!199 &6542693245334262270 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -136492,7 +136492,7 @@ ParticleSystem: --- !u!199 &6542693245491611079 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -143999,7 +143999,7 @@ ParticleSystem: --- !u!199 &4325216380872068964 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} From 997aa4831f8961c35e88cad2ce99ce9b9af98654 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 20 Dec 2021 13:41:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=87=B3=E5=B0=8A=E9=99=8D=E4=B8=96?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8B=8D=E8=84=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Adventure/AdventureManager.lua | 2 +- .../~Lua/Modules/Expert/PatFaceManager.lua | 2 +- .../ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua | 7 ++++++- .../ManagedResources/~Lua/Modules/Player/JumpManager.lua | 7 ++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua index 37c190c1f6..0345999ffc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua @@ -235,7 +235,7 @@ function this.GetIsMaxTime() return end if this.stateTime >= (this.adventureOffline - 1) * 3600 then - if not UIManager.IsOpen(UIName.SupremeHeroPopup) then + if not UIManager.IsOpen(UIName.SupremeHeroPopup) or not UIManager.IsOpen(UIName.SupremeHeroPopupNew) then UIManager.OpenPanel(UIName.FightAreaRewardFullPopup) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index a06d96be6f..89c1baf3f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -109,7 +109,7 @@ function this.PatFaceSpecialMonitorOpenRules(v,patFaceAllData,type,starUpGiftNum end elseif v.OpenRules[1] == 5 then local activityId = ActivityGiftManager.IsActivityTypeOpen(v.OpenRules[2]) - if activityId and activityId==42 then + if activityId and (activityId==42 or activityId==4201) then this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum) elseif activityId and activityId==v.Values then this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index 765d2dd0d3..6d8050fe84 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -334,7 +334,12 @@ function PatFacePanel:OnShowOb3Data() end --第四种显示 function PatFacePanel:OnShowOb4Data() - UIManager.OpenPanel(UIName.SupremeHeroPopup,function() self:ClosePanel() end) + local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) + if actId == 42 then + UIManager.OpenPanel(UIName.SupremeHeroPopup,function() self:ClosePanel() end) + else + UIManager.OpenPanel(UIName.SupremeHeroPopupNew,function() self:ClosePanel() end) + end end --第五种显示 五星成长礼 local timeOb5 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 8018b5ee39..39a7084864 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -711,7 +711,12 @@ local jumpDic = { UIManager.OpenPanel(UIName.FirstRechargePanel) end, [JumpType.ZhiZunJiangShi] = function(data) - UIManager.OpenPanel(UIName.SupremeHeroPopup) + local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) + if actId == 42 then + UIManager.OpenPanel(UIName.SupremeHeroPopup) + else + UIManager.OpenPanel(UIName.SupremeHeroPopupNew) + end end, [JumpType.SurpriseBox] = function(data) local activityId = ActivityGiftManager.IsActivityTypeOpen(data[1])