dev_chengFeng
parent
1e495ac6db
commit
f186f29646
|
@ -1969,6 +1969,7 @@ RANK_TYPE = {
|
||||||
CELEBRATION_GUILD = 27,--社稷大典工会排行
|
CELEBRATION_GUILD = 27,--社稷大典工会排行
|
||||||
FIGHTLEVEL_PROGRESS = 29,--山河社稷图进度
|
FIGHTLEVEL_PROGRESS = 29,--山河社稷图进度
|
||||||
FIGHTLEVEL_STAR = 30,--山河社稷图星数
|
FIGHTLEVEL_STAR = 30,--山河社稷图星数
|
||||||
|
-- TASUILINGXIAO = 31,--踏碎凌霄伤害
|
||||||
}
|
}
|
||||||
|
|
||||||
--东海寻仙弹窗类型
|
--东海寻仙弹窗类型
|
||||||
|
@ -2308,6 +2309,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
|
||||||
[14] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = Language[11006] ,rankType = RANK_TYPE.CELEBRATION_GUILD,activiteId = ActivityTypeDef.Celebration,isRankingMainPanelShow = false},
|
[14] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = Language[11006] ,rankType = RANK_TYPE.CELEBRATION_GUILD,activiteId = ActivityTypeDef.Celebration,isRankingMainPanelShow = false},
|
||||||
[15] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_PROGRESS,activiteId = 0,isRankingMainPanelShow = false},
|
[15] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_PROGRESS,activiteId = 0,isRankingMainPanelShow = false},
|
||||||
[16] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow = false},
|
[16] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow = false},
|
||||||
|
-- [17] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = "排行榜" ,rankType = RANK_TYPE.TASUILINGXIAO,activiteId = ActivityTypeDef.TaSuiLingXiao,isRankingMainPanelShow = false},
|
||||||
}
|
}
|
||||||
|
|
||||||
SoulPrintSpriteByQuantity={
|
SoulPrintSpriteByQuantity={
|
||||||
|
|
|
@ -771,19 +771,7 @@ end
|
||||||
|
|
||||||
--设置右侧条
|
--设置右侧条
|
||||||
function this.SetRightBarSize()
|
function this.SetRightBarSize()
|
||||||
LogWarn("SetRightBarSize刷新")
|
|
||||||
this.RightUp2:SetActive(PlayerManager.level >= 5)
|
this.RightUp2:SetActive(PlayerManager.level >= 5)
|
||||||
-- local this.RightUp2bgSize = Util.GetGameObject(this.RightUp2,"BG"):GetComponent("RectTransform")
|
|
||||||
-- local this.RightUp2btn = Util.GetGameObject(this.RightUp2,"BG/Button")
|
|
||||||
-- local this.RightUp2btnImg = Util.GetGameObject(this.RightUp2,"BG/Button"):GetComponent("RectTransform")
|
|
||||||
-- local this.RightUp2rectSize = Util.GetGameObject(this.RightUp2,"Ract2D"):GetComponent("RectTransform")
|
|
||||||
-- local this.RightUp2gridSize = this.RightUp2Grid :GetComponent("RectTransform")
|
|
||||||
|
|
||||||
-- this.RightUp2bgSize = Util.GetGameObject(this.RightUp2,"BG"):GetComponent("RectTransform")
|
|
||||||
-- this.RightUp2btn = Util.GetGameObject(this.RightUp2,"BG/Button")
|
|
||||||
-- this.RightUp2btnImg = Util.GetGameObject(this.RightUp2,"BG/Button"):GetComponent("RectTransform")
|
|
||||||
-- this.RightUp2rectSize = Util.GetGameObject(this.RightUp2,"Ract2D"):GetComponent("RectTransform")
|
|
||||||
-- this.RightUp2gridSize = this.RightUp2Grid :GetComponent("RectTransform")
|
|
||||||
|
|
||||||
local str = PlayerPrefs.GetInt(PlayerManager.uid.."MainRightBarSetting")
|
local str = PlayerPrefs.GetInt(PlayerManager.uid.."MainRightBarSetting")
|
||||||
if not str or str == 0 then
|
if not str or str == 0 then
|
||||||
|
|
|
@ -180,33 +180,35 @@ function this.SetRankingInfo(isTop, isAnim)
|
||||||
-- this.SetNotRollingInfo("角色信息","最高战力","我的排名:","我的战力",myRankData.myRank,"未上榜",FormationManager.GetFormationPower(1),myRankData.myRank,myRankData.myForce)
|
-- this.SetNotRollingInfo("角色信息","最高战力","我的排名:","我的战力",myRankData.myRank,"未上榜",FormationManager.GetFormationPower(1),myRankData.myRank,myRankData.myForce)
|
||||||
this.SetNotRollingInfo(myRankData)
|
this.SetNotRollingInfo(myRankData)
|
||||||
local dData
|
local dData
|
||||||
if sData.rankType == RANK_TYPE.FIGHT_LEVEL_RANK then
|
if sData.rankType == RANK_TYPE.FIGHT_LEVEL_RANK then--等级排行
|
||||||
dData = { rankInfo = {param1 = myRankData.param1},
|
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1}
|
||||||
force = myRankData.param1}
|
|
||||||
elseif sData.rankType == RANK_TYPE.FORCE_CURR_RANK then
|
elseif sData.rankType == RANK_TYPE.FORCE_CURR_RANK then--战力排行
|
||||||
dData = {rankInfo = {param1 = myRankData.param1},
|
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1}
|
||||||
force = myRankData.param1}
|
|
||||||
elseif sData.rankType == RANK_TYPE.GUILD_FORCE_RANK then
|
elseif sData.rankType == RANK_TYPE.GUILD_FORCE_RANK then--公会战力
|
||||||
dData = {rankInfo = {rank = myRankData.rank ,param1= myRankData.param1},
|
dData = {rankInfo = {rank = myRankData.rank ,param1= myRankData.param1},guildName = PlayerManager.familyId == 0 and "" or MyGuildManager.GetMyGuildInfo().name}
|
||||||
guildName = PlayerManager.familyId == 0 and "" or MyGuildManager.GetMyGuildInfo().name}
|
|
||||||
elseif sData.rankType == RANK_TYPE.MONSTER_RANK then
|
elseif sData.rankType == RANK_TYPE.MONSTER_RANK then--心魔试炼
|
||||||
dData = {rankInfo = {param1 = myRankData.param1},
|
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1}
|
||||||
force = myRankData.param1}
|
|
||||||
elseif sData.rankType == RANK_TYPE.GOLD_EXPER then
|
elseif sData.rankType == RANK_TYPE.GOLD_EXPER then--点金达人
|
||||||
dData = {rankInfo = {rank = myRankData.rank ,param1= myRankData.param1},
|
dData = {rankInfo = {rank = myRankData.rank ,param1= myRankData.param1},userName = PlayerManager.nickName}
|
||||||
userName = PlayerManager.nickName}
|
|
||||||
elseif sData.rankType == RANK_TYPE.ARENA_RANK then
|
elseif sData.rankType == RANK_TYPE.ARENA_RANK then--排行榜
|
||||||
dData = { rankInfo = {param1 = myRankData.param1},
|
dData = {rankInfo = {param1 = myRankData.param1},score = myRankData.param1}
|
||||||
score = myRankData.param1}
|
|
||||||
elseif sData.rankType == RANK_TYPE.CELEBRATION_GUILD then
|
elseif sData.rankType == RANK_TYPE.CELEBRATION_GUILD then--社稷大典
|
||||||
dData = { rankInfo = {param1 = myRankData.param1},
|
dData = {rankInfo = {param1 = myRankData.param1},score = myRankData.param1}
|
||||||
score = myRankData.param1}
|
|
||||||
elseif sData.rankType == RANK_TYPE.FIGHTLEVEL_PROGRESS then
|
elseif sData.rankType == RANK_TYPE.FIGHTLEVEL_PROGRESS then--山河社稷图进度
|
||||||
dData = { rankInfo = {param1 = myRankData.param1},
|
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1}
|
||||||
force = myRankData.param1}
|
|
||||||
elseif sData.rankType == RANK_TYPE.FIGHTLEVEL_STAR then
|
elseif sData.rankType == RANK_TYPE.FIGHTLEVEL_STAR then--山河社稷图星星
|
||||||
dData = { rankInfo = {param1 = myRankData.param1},
|
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1}
|
||||||
force = myRankData.param1}
|
|
||||||
|
-- elseif sData.rankType == RANK_TYPE.TASUILINGXIAO then--踏碎凌霄
|
||||||
|
-- dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1}
|
||||||
end
|
end
|
||||||
this.SetInfoShow(this.infoGo,dData,sData.rankType)
|
this.SetInfoShow(this.infoGo,dData,sData.rankType)
|
||||||
--数据拆分
|
--数据拆分
|
||||||
|
@ -388,7 +390,7 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
||||||
arenaScore:SetActive(false)
|
arenaScore:SetActive(false)
|
||||||
FightLeveStar:SetActive(false)
|
FightLeveStar:SetActive(false)
|
||||||
-- LogGreen("rankType "..rankType)
|
-- LogGreen("rankType "..rankType)
|
||||||
if rankType == RANK_TYPE.FIGHT_LEVEL_RANK then
|
if rankType == RANK_TYPE.FIGHT_LEVEL_RANK then--等级
|
||||||
--LogGreen("data.rankInfo.param1 "..data.rankInfo.param1)
|
--LogGreen("data.rankInfo.param1 "..data.rankInfo.param1)
|
||||||
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||||
fight:SetActive(true)
|
fight:SetActive(true)
|
||||||
|
@ -397,7 +399,7 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
||||||
end
|
end
|
||||||
Util.GetGameObject(go,"fight"):GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.MainLevelConfig,data.rankInfo.param1).Name)
|
Util.GetGameObject(go,"fight"):GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.MainLevelConfig,data.rankInfo.param1).Name)
|
||||||
end
|
end
|
||||||
elseif rankType == RANK_TYPE.FORCE_CURR_RANK then
|
elseif rankType == RANK_TYPE.FORCE_CURR_RANK then--战力排行
|
||||||
if data.rankInfo.param1 and data.rankInfo.param1 >0 then
|
if data.rankInfo.param1 and data.rankInfo.param1 >0 then
|
||||||
warPower:SetActive(true)
|
warPower:SetActive(true)
|
||||||
if Value0 then
|
if Value0 then
|
||||||
|
@ -406,7 +408,7 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
||||||
Util.GetGameObject(go,"warPower/Text"):SetActive(true)
|
Util.GetGameObject(go,"warPower/Text"):SetActive(true)
|
||||||
Util.GetGameObject(go,"warPower/Text"):GetComponent("Text").text = data.rankInfo.param1--data.force
|
Util.GetGameObject(go,"warPower/Text"):GetComponent("Text").text = data.rankInfo.param1--data.force
|
||||||
end
|
end
|
||||||
elseif rankType == RANK_TYPE.GUILD_FORCE_RANK then
|
elseif rankType == RANK_TYPE.GUILD_FORCE_RANK then--公会战力
|
||||||
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||||
warPower:SetActive(true)
|
warPower:SetActive(true)
|
||||||
if Value0 then
|
if Value0 then
|
||||||
|
@ -415,7 +417,7 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
||||||
Util.GetGameObject(go,"warPower/Text"):SetActive(true)
|
Util.GetGameObject(go,"warPower/Text"):SetActive(true)
|
||||||
Util.GetGameObject(go,"warPower/Text"):GetComponent("Text").text = data.rankInfo.param1
|
Util.GetGameObject(go,"warPower/Text"):GetComponent("Text").text = data.rankInfo.param1
|
||||||
end
|
end
|
||||||
elseif rankType == RANK_TYPE.MONSTER_RANK then
|
elseif rankType == RANK_TYPE.MONSTER_RANK then--心魔试炼
|
||||||
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||||
trial:SetActive(true)
|
trial:SetActive(true)
|
||||||
if Value0 then
|
if Value0 then
|
||||||
|
@ -424,7 +426,7 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
||||||
Util.GetGameObject(go,"trial/Text"):SetActive(false)
|
Util.GetGameObject(go,"trial/Text"):SetActive(false)
|
||||||
Util.GetGameObject(go,"trial/tip"):GetComponent("Text").text = Language[11689].. data.rankInfo.param1
|
Util.GetGameObject(go,"trial/tip"):GetComponent("Text").text = Language[11689].. data.rankInfo.param1
|
||||||
end
|
end
|
||||||
elseif rankType == RANK_TYPE.GOLD_EXPER then
|
elseif rankType == RANK_TYPE.GOLD_EXPER then--达人
|
||||||
if GetCurLanguage() == 0 then
|
if GetCurLanguage() == 0 then
|
||||||
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").fontSize = 38
|
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").fontSize = 38
|
||||||
else
|
else
|
||||||
|
@ -438,22 +440,22 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
||||||
end
|
end
|
||||||
Util.GetGameObject(go,"goldExper/Text"):GetComponent("Text").text = data.rankInfo.param1
|
Util.GetGameObject(go,"goldExper/Text"):GetComponent("Text").text = data.rankInfo.param1
|
||||||
end
|
end
|
||||||
if sData.activiteId == ActivityTypeDef.GoldExper then
|
if sData.activiteId == ActivityTypeDef.GoldExper then--点金达人
|
||||||
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11690]
|
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11690]
|
||||||
elseif sData.activiteId == ActivityTypeDef.FastExplore then
|
elseif sData.activiteId == ActivityTypeDef.FastExplore then--急速探索
|
||||||
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11691]
|
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11691]
|
||||||
elseif sData.activiteId == ActivityTypeDef.FindTreasureExper then
|
elseif sData.activiteId == ActivityTypeDef.FindTreasureExper then--寻宝达人
|
||||||
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11692]
|
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11692]
|
||||||
elseif sData.activiteId == ActivityTypeDef.ExpeditionExper then
|
elseif sData.activiteId == ActivityTypeDef.ExpeditionExper then--天宫达人
|
||||||
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11693]
|
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11693]
|
||||||
elseif sData.activiteId == ActivityTypeDef.DemonSlayer then
|
elseif sData.activiteId == ActivityTypeDef.DemonSlayer then--三界降魔
|
||||||
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11694]
|
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11694]
|
||||||
elseif sData.activiteId == ActivityTypeDef.slhjExper then
|
elseif sData.activiteId == ActivityTypeDef.slhjExper then
|
||||||
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11695]
|
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11695]
|
||||||
elseif sData.activiteId == ActivityTypeDef.Celebration then
|
elseif sData.activiteId == ActivityTypeDef.Celebration then--社稷大典
|
||||||
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11696]
|
Util.GetGameObject(go,"goldExper/tip"):GetComponent("Text").text = Language[11696]
|
||||||
end
|
end
|
||||||
elseif rankType == RANK_TYPE.ARENA_RANK then
|
elseif rankType == RANK_TYPE.ARENA_RANK then--竞技场
|
||||||
arenaScore:SetActive(true)
|
arenaScore:SetActive(true)
|
||||||
local str = ""
|
local str = ""
|
||||||
if Value0 then
|
if Value0 then
|
||||||
|
@ -466,7 +468,7 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
||||||
end
|
end
|
||||||
Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = str
|
Util.GetGameObject(go,"arenaScore"):GetComponent("Text").text = str
|
||||||
|
|
||||||
elseif rankType == RANK_TYPE.CELEBRATION_GUILD then
|
elseif rankType == RANK_TYPE.CELEBRATION_GUILD then--社稷大典工会排行
|
||||||
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||||
trial:SetActive(true)
|
trial:SetActive(true)
|
||||||
if Value0 then
|
if Value0 then
|
||||||
|
@ -482,7 +484,7 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
||||||
Util.GetGameObject(go,"trial/tip"):GetComponent("Text").text = Language[11697]
|
Util.GetGameObject(go,"trial/tip"):GetComponent("Text").text = Language[11697]
|
||||||
Util.GetGameObject(go,"trial/Text"):GetComponent("Text").text = data.rankInfo.param1
|
Util.GetGameObject(go,"trial/Text"):GetComponent("Text").text = data.rankInfo.param1
|
||||||
end
|
end
|
||||||
elseif rankType == RANK_TYPE.FIGHTLEVEL_PROGRESS then
|
elseif rankType == RANK_TYPE.FIGHTLEVEL_PROGRESS then--山河社稷图进度
|
||||||
LogYellow("data.rankInfo.param1 "..data.rankInfo.param1)
|
LogYellow("data.rankInfo.param1 "..data.rankInfo.param1)
|
||||||
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||||
fight:SetActive(true)
|
fight:SetActive(true)
|
||||||
|
@ -491,7 +493,7 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
||||||
end
|
end
|
||||||
fight:GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.HardStage,data.rankInfo.param1).Name)
|
fight:GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.HardStage,data.rankInfo.param1).Name)
|
||||||
end
|
end
|
||||||
elseif rankType == RANK_TYPE.FIGHTLEVEL_STAR then
|
elseif rankType == RANK_TYPE.FIGHTLEVEL_STAR then--山河社稷图星星
|
||||||
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||||
FightLeveStar:SetActive(true)
|
FightLeveStar:SetActive(true)
|
||||||
if Value0 then
|
if Value0 then
|
||||||
|
@ -499,6 +501,14 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
||||||
end
|
end
|
||||||
Util.GetGameObject(FightLeveStar,"Text"):GetComponent("Text").text = data.rankInfo.param1
|
Util.GetGameObject(FightLeveStar,"Text"):GetComponent("Text").text = data.rankInfo.param1
|
||||||
end
|
end
|
||||||
|
-- elseif rankType == RANK_TYPE.TASUILINGXIAO then--踏碎凌霄排行
|
||||||
|
-- if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||||
|
-- FightLeveStar:SetActive(true)
|
||||||
|
-- if Value0 then
|
||||||
|
-- Value0:GetComponent("Text").text = "<size=40%>"..data.userName.."</size>"
|
||||||
|
-- end
|
||||||
|
-- Util.GetGameObject(FightLeveStar,"Text"):GetComponent("Text").text = data.rankInfo.param1
|
||||||
|
-- end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return RankingSingleListPanel
|
return RankingSingleListPanel
|
||||||
|
|
Loading…
Reference in New Issue