Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-12-20 14:05:56 +08:00
commit 6d93ab7dca
7 changed files with 50 additions and 37 deletions

View File

@ -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}

View File

@ -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

View File

@ -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
-- 战斗暂停控制

View File

@ -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)

View File

@ -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

View File

@ -3137,12 +3137,13 @@ 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
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 +3152,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

View File

@ -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])