玉虚bug修改
parent
1b2c8cc693
commit
c4d7edc289
File diff suppressed because it is too large
Load Diff
|
@ -1078,6 +1078,7 @@ JumpType = {
|
||||||
JumpServerHightLadder = 82,--灵兽山
|
JumpServerHightLadder = 82,--灵兽山
|
||||||
HongMengZhen = 86,-- 鸿蒙阵
|
HongMengZhen = 86,-- 鸿蒙阵
|
||||||
FightLevel = 107,-- 山河社稷图
|
FightLevel = 107,-- 山河社稷图
|
||||||
|
YuXuLunDao= 111, --玉虚论道
|
||||||
QiJieShiLian = 112,--七界试炼
|
QiJieShiLian = 112,--七界试炼
|
||||||
SiXiangXinFa = 113,--四象心法
|
SiXiangXinFa = 113,--四象心法
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ local switchFunc = function (type)
|
||||||
this.curIndex = 1
|
this.curIndex = 1
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
LogError("curindex==3")
|
LogGreen("curindex==3")
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
if this.curIndex ~= 1 then
|
if this.curIndex ~= 1 then
|
||||||
|
@ -36,7 +36,7 @@ local switchFunc = function (type)
|
||||||
this.curIndex = 3
|
this.curIndex = 3
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
LogError("curindex==1")
|
LogGreen("curindex==1")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
this.ChangeTeamIndex(type)
|
this.ChangeTeamIndex(type)
|
||||||
|
@ -205,7 +205,7 @@ function this.ChangeHeroTeam(id,_index,_pos)
|
||||||
for i = 1, #value.teamHeroInfos do
|
for i = 1, #value.teamHeroInfos do
|
||||||
if value.teamHeroInfos[i].heroId==id then
|
if value.teamHeroInfos[i].heroId==id then
|
||||||
hero=value.teamHeroInfos[i]
|
hero=value.teamHeroInfos[i]
|
||||||
LogError("从旧队伍里面移除 "..value.teamId)
|
LogGreen("从旧队伍里面移除 "..value.teamId)
|
||||||
table.removebyvalue(value.teamHeroInfos,value.teamHeroInfos[i])
|
table.removebyvalue(value.teamHeroInfos,value.teamHeroInfos[i])
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
|
@ -215,7 +215,7 @@ function this.ChangeHeroTeam(id,_index,_pos)
|
||||||
table.insert(currAllTeams[_index].teamHeroInfos,hero)
|
table.insert(currAllTeams[_index].teamHeroInfos,hero)
|
||||||
allHeros[id].pos=_pos
|
allHeros[id].pos=_pos
|
||||||
allHeros[id].index=_index
|
allHeros[id].index=_index
|
||||||
LogError("添加到新队伍 ".._index)
|
LogGreen("添加到新队伍 ".._index)
|
||||||
end
|
end
|
||||||
|
|
||||||
--添加到队伍
|
--添加到队伍
|
||||||
|
@ -232,7 +232,7 @@ function this.AddHeroToTeam(id,pos,index)
|
||||||
end
|
end
|
||||||
table.insert(currAllTeams[index].teamHeroInfos,{heroId=id,position=pos})
|
table.insert(currAllTeams[index].teamHeroInfos,{heroId=id,position=pos})
|
||||||
if not allHeros[id] then
|
if not allHeros[id] then
|
||||||
LogError(" 新添加英雄=="..id)
|
-- LogError(" 新添加英雄=="..id)
|
||||||
allHeros[id]={Id=id,pos=pos,index=index}
|
allHeros[id]={Id=id,pos=pos,index=index}
|
||||||
else
|
else
|
||||||
allHeros[id].Id=id
|
allHeros[id].Id=id
|
||||||
|
@ -318,7 +318,6 @@ function this.On_Btn2_Click()
|
||||||
local newHero={}
|
local newHero={}
|
||||||
newHero.heroId=value.Id
|
newHero.heroId=value.Id
|
||||||
newHero.position=value.pos
|
newHero.position=value.pos
|
||||||
LogError(" id=="..value.Id.." posi=="..value.pos)
|
|
||||||
if value.index==2001 then
|
if value.index==2001 then
|
||||||
table.insert(oneTeam,newHero)
|
table.insert(oneTeam,newHero)
|
||||||
elseif value.index==2002 then
|
elseif value.index==2002 then
|
||||||
|
|
|
@ -793,6 +793,13 @@ local jumpDic = {
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
end,
|
end,
|
||||||
|
[JumpType.YuXuLunDao] = function(data)
|
||||||
|
QiJieShiLianManager.CheckQiJieJump(FUNCTION_OPEN_TYPE.JumpServer_YuXu,2,function ()
|
||||||
|
NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg)
|
||||||
|
UIManager.OpenPanel(UIName.WorldArenaMainPanel,msg)
|
||||||
|
end)
|
||||||
|
end)
|
||||||
|
end,
|
||||||
[JumpType.linglongBaojing] = function(data)
|
[JumpType.linglongBaojing] = function(data)
|
||||||
this.JumpActivity(JumpType.linglongBaojing % 10000,data[1])
|
this.JumpActivity(JumpType.linglongBaojing % 10000,data[1])
|
||||||
end,
|
end,
|
||||||
|
|
|
@ -153,6 +153,7 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
|
||||||
--队伍阵容
|
--队伍阵容
|
||||||
for i, hero in pairs(data) do
|
for i, hero in pairs(data) do
|
||||||
local heroTid = data[i].heroId
|
local heroTid = data[i].heroId
|
||||||
|
local frameBtn = Util.GetGameObject(self.Heros[index][hero.position], "frame")
|
||||||
if heroTid then
|
if heroTid then
|
||||||
local heroGo = Util.GetGameObject(self.Heros[index][hero.position], "hero")
|
local heroGo = Util.GetGameObject(self.Heros[index][hero.position], "hero")
|
||||||
local heroData=HeroManager.GetSingleHeroData(heroTid)
|
local heroData=HeroManager.GetSingleHeroData(heroTid)
|
||||||
|
@ -164,18 +165,10 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
|
||||||
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = heroData.lv
|
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = heroData.lv
|
||||||
Util.GetGameObject(self.Heros[index][hero.position], "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
Util.GetGameObject(self.Heros[index][hero.position], "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
||||||
SetHeroIcon(self.spLoader, hero,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig)
|
SetHeroIcon(self.spLoader, hero,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig)
|
||||||
local frameBtn = Util.GetGameObject(self.Heros[index][hero.position], "frame")
|
|
||||||
local heroData = {}
|
local heroData = {}
|
||||||
Util.AddOnceClick(frameBtn, function()
|
Util.AddOnceClick(Util.GetGameObject(heroGo, "icon"), function()
|
||||||
LogError("playerid=="..PlayerManager.uid.." heroid=="..hero.heroId.." servername=="..1 .." arrayid=="..2000+index)
|
|
||||||
-- NetManager.ViewHeroInfoRequest(PlayerManager.uid,hero.heroId,1,2000+index,function(msg)
|
|
||||||
-- if not hero.heroid then
|
|
||||||
-- return
|
|
||||||
-- end
|
|
||||||
-- heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
|
|
||||||
-- GoodFriendManager.InitEquipData(msg.equip,heroData)
|
|
||||||
-- UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
|
|
||||||
-- end)
|
|
||||||
local heroData = HeroManager.GetSingleHeroData(hero.heroId)
|
local heroData = HeroManager.GetSingleHeroData(hero.heroId)
|
||||||
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,false)
|
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,false)
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -201,7 +201,8 @@ function this.RankNodeAdapter(node, data,index)
|
||||||
windData.fightData=fightDataList
|
windData.fightData=fightDataList
|
||||||
windData.myScore= data.myScoreChange
|
windData.myScore= data.myScoreChange
|
||||||
windData.defScore= data.myScoreChange *-1
|
windData.defScore= data.myScoreChange *-1
|
||||||
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,windData,2,nil,data.resultList)
|
|
||||||
|
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,windData,2,nil,msg.recordData.result)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue