罗浮争锋修改提交

wangzhenxing 2024-06-19 15:29:54 +08:00
parent 1349989dce
commit 7f96de523a
6 changed files with 64 additions and 5 deletions

View File

@ -38,7 +38,11 @@ function this.MakeAEmptyTeam(teamId)
oTeam.teamName = Language[10685]-- 1001
elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then
oTeam.teamName = Language[10678]-- 1301
elseif teamId == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
elseif teamId == FormationTypeDef.JUMPSERVER_HIGHTLADDER or
teamId==FormationTypeDef.LuoFuZhengFeng1 or
teamId==FormationTypeDef.LuoFuZhengFeng2 or
teamId==FormationTypeDef.LuoFuZhengFeng3 or
teamId==FormationTypeDef.LuoFuZhengFeng4 then
oTeam.teamName = "鸟笼竞技场"-- 1601
elseif teamId == FormationTypeDef.FIGHT_LEVEL then
oTeam.teamName = "征服四海"-- 1701

View File

@ -561,6 +561,32 @@ function this.GetAllHeroDatas(_lvLimit)
)
return heros
end
--获取所有英雄信息
function this.GetHeroDatasByNaturalAndProfession(_qua,_pro)
local heros = {}
for i, v in pairs(heroDatas) do
if v.heroConfig.Natural == _qua and v.heroConfig.PropertyName==_pro and CheckListIsContainValue1(HelpFightManager.upHeroList,v.dynamicId)==false then
table.insert(heros, v)
end
end
table.sort(
heros,
function(a, b)
if a.star == b.star then
return a.lv>b.lv
else
return a.star > b.star
end
end
)
return heros
end
--获取该静态id sortid最小的英雄信息
function this.GetHeroDataByHeroSIdAndMinSortId(_heroSId)
local heroData = {}
@ -731,7 +757,15 @@ function this.GetHeroFormationStr(teamId)
elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then
return Language[11104]
elseif teamId == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
return"该英雄在罗浮争锋阵容中已上阵"
return"该神将在鸟笼竞技场阵容中已上阵"
elseif teamId == FormationTypeDef.LuoFuZhengFeng1 then
return"该神将在鸟笼竞技场阵容中已上阵"
elseif teamId == FormationTypeDef.LuoFuZhengFeng2 then
return"该神将在鸟笼竞技场阵容中已上阵"
elseif teamId == FormationTypeDef.LuoFuZhengFeng3 then
return"该神将在鸟笼竞技场阵容中已上阵"
elseif teamId == FormationTypeDef.LuoFuZhengFeng4 then
return"该神将在鸟笼竞技场阵容中已上阵"
end
end
return ""
@ -758,6 +792,14 @@ function this.GetHeroFormationStr2(teamId)
return Language[11110], FormationTypeDef.ARENA_TOM_MATCH
elseif teamId == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
return "鸟笼竞技场", FormationTypeDef.JUMPSERVER_HIGHTLADDER
elseif teamId == FormationTypeDef.LuoFuZhengFeng1 then
return "鸟笼竞技场", FormationTypeDef.LuoFuZhengFeng1
elseif teamId == FormationTypeDef.LuoFuZhengFeng2 then
return "鸟笼竞技场", FormationTypeDef.LuoFuZhengFeng2
elseif teamId == FormationTypeDef.LuoFuZhengFeng3 then
return "鸟笼竞技场", FormationTypeDef.LuoFuZhengFeng3
elseif teamId == FormationTypeDef.LuoFuZhengFeng4 then
return "鸟笼竞技场", FormationTypeDef.LuoFuZhengFeng4
end
end
return ""

View File

@ -192,7 +192,11 @@ function this.SingleHeroDataShow(go,_heroData)
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
-- JumpManager.GoJump(57001)
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng1
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng2
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng3
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng4 then
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.JUMPSERVER_HIGHTLADDER)
end
end

View File

@ -260,7 +260,11 @@ function this.SingleHeroDataShow(go,_heroData)
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
-- JumpManager.GoJump(57001)
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng1
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng2
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng3
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng4 then
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.JUMPSERVER_HIGHTLADDER)
end
end

View File

@ -192,7 +192,11 @@ function this.SingleHeroDataShow(go,_heroData)
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
-- JumpManager.GoJump(57001)
UIManager.OpenPanel(UIName.ArenaTopMatchPanel)
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER then
elseif heroData.isFormations[1] == FormationTypeDef.JUMPSERVER_HIGHTLADDER
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng1
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng2
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng3
or heroData.isFormations[1] == FormationTypeDef.LuoFuZhengFeng4 then
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.JUMPSERVER_HIGHTLADDER)
end
end

View File

@ -219,6 +219,7 @@ function RoleUpStarLayout:UpdateHeroUpStarData()
else
Util.GetGameObject(go.transform,"add/add"):SetActive(false)
end
Util.GetGameObject(go.transform,"num"):SetActive(true)
Util.GetGameObject(go.transform,"num"):GetComponent("Text").text=string.format("<color=#FF0000FF>%s/%s</color>",0,curUpStarData[i].upStarData[4])
SetHeroStars(this.spLoader, Util.GetGameObject(go.transform, "iconbg/starGrid"), curUpStarData[i].upStarMaterialsData.StarLimit,1,nil,-15.3)
Util.SetParticleSortLayer(Util.GetGameObject(go.transform, "iconbg/starGrid"),self.sortingOrder + 1)