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

dev_chengFeng
jiaoyangna 2022-03-07 10:13:08 +08:00
commit d6a67e89f2
8 changed files with 74 additions and 11 deletions

View File

@ -2804,6 +2804,9 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
[29] = { bgImage = "r_zjm_paihangbang_banner01", name = "妖灵试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 3,isRankingMainPanelShow = false},
[30] = { bgImage = "r_zjm_paihangbang_banner01", name = "道玄试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 4,isRankingMainPanelShow = false},
[31] = { bgImage = "", name = Language[12101] ,rankType = RANK_TYPE.WORLDARENA,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 10},
--车迟斗法
[35] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_SINGLE,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0},
[36] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_GUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0},
}

View File

@ -10975,6 +10975,10 @@ local passivityList = {
if not skill then
return
end
--舍身济世分担不触发
if damageType==3 then
return
end
--如果是boss 并且额外伤害是根据最大生命则返回
local isBoss=BattleUtil.CheckIsBoss(target)
if isBoss and pro==12 then
@ -10999,7 +11003,42 @@ local passivityList = {
role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast,nil,nil,role)
role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillCastEnd,nil,nil,role)
end,
--回合开始前,为我方[a]属性最[b]神将[c]改变[d]点怒气,为敌方[e]属性最[f]神将[g]改变[h]点怒气,每局可触发[i]次
-- a[int],b[int],c[int],d[int],e[int],f[int],g[int],h[int],i[int]
[428] = function(role, args,id,judge)
local p1 = args[1]
local s1 = args[2]
local ct1= args[3]
local v1 = args[4]
local p2 = args[5]
local s2 = args[6]
local ct2= args[7]
local v2 = args[8]
local t1 = args[9]
local time=0
BattleLogic.Event:AddEvent(BattleEventName.BattleRoundStart, function(curRound)
if PassiveManager.passiveCountList[role.camp][428] and PassiveManager.passiveCountList[role.camp][428] > 0 then
return
end
PassiveManager.passiveCountList[role.camp][428] = 1
if time>=t1 then
return
end
local list = RoleManager.Query(function(v) return v.camp == role.camp end)
list = BattleUtil.SortByProp(list, BattlePropList[p1],s1)
if list and #list>0 then
BattleUtil.CalRage(role,list[1],v1,ct1)
end
local list2 = RoleManager.Query(function(v) return v.camp ~= role.camp end)
list2 = BattleUtil.SortByProp(list2, BattlePropList[p2],s2)
if list2 and #list2>0 then
BattleUtil.CalRage(role,list2[1],v2,ct2)
end
time=time+1
end)
end,
}
return passivityList

View File

@ -114,7 +114,11 @@ function this.SingleInfoDataShow(go,data)
end
Util.GetGameObject(go, "infoText/playerName"):GetComponent("Text").text = data.userName
Util.GetGameObject(go, "infoText/warPower"):GetComponent("Text").text = data.force
Util.GetGameObject(go, "infoText/guildName"):GetComponent("Text").text = data.guildName
local guildName = data.guildName
if data.serverName and data.serverName ~= "" then
guildName = data.serverName.." "..guildName
end
Util.GetGameObject(go, "infoText/guildName"):GetComponent("Text").text = guildName
Util.GetGameObject(go, "infoText/soreText"):GetComponent("Text").text = data.score
--LogError("#data.teamInfo "..#data.teamInfo)
--hadChallenge =6; // 是否已挑战过1表示挑战过2未挑战过。

View File

@ -41,17 +41,17 @@ end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function GuildCarDelayLootRecordPopup:OnShow()
local curallLootRecordData = {}
--LogError("carChallengeItem.carChallengeItem "..#carChallengeItem.carChallengeItem)
-- LogError("carChallengeItem.carChallengeItem "..#carChallengeItem.carChallengeItem)
--table.sort(carChallengeItem.carChallengeItem, function(a,b) return a.time > b.time end)
for i = 1, #carChallengeItem.carChallengeItem do
if carChallengeItem.carChallengeItem[i] and carChallengeItem.carChallengeItem[i].content ~= "" then
local timeStr = os.date("%Y%m%d",carChallengeItem.carChallengeItem[i].time)
if not curallLootRecordData[timeStr] then
curallLootRecordData[timeStr] = {}
-- LogError("star "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content)
-- LogYellow("star "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content)
table.insert(curallLootRecordData[timeStr],carChallengeItem.carChallengeItem[i])
else
-- LogError("add "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content)
-- LogGreen("add "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content)
table.insert(curallLootRecordData[timeStr],carChallengeItem.carChallengeItem[i])
end
end
@ -89,7 +89,11 @@ function GuildCarDelayLootRecordPopup:OnShow()
end
titleText[i][j]:SetActive(true)
Util.AddOnceClick(titleText[i][j], function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, allLootRecordData[i][j].uid)
if PlayerManager.isCross == 1 then
UIManager.OpenPanel(UIName.PlayerInfoPopup, allLootRecordData[i][j].uid, PLAYER_INFO_VIEW_TYPE.NORMAL,1)
else
UIManager.OpenPanel(UIName.PlayerInfoPopup, allLootRecordData[i][j].uid)
end
end)
end
isShowEmptyObj = false

View File

@ -317,12 +317,13 @@ function this.SingleRankDataShow(go,userRank)
sortNumTabs[4]:SetActive(true)
Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = userRank.rankInfo.rank
end
local serverName = PlayerManager.isCross == 1 and "("..userRank.serverName..") " or ""
if curIndex == 2 then
Util.GetGameObject(go, "Value0"):GetComponent("Text").text = userRank.userName
Util.GetGameObject(go, "Value0"):GetComponent("Text").text = serverName..userRank.userName
this.ScrollTitleRootName.text = Language[11020]
elseif curIndex == 1 then
this.ScrollTitleRootName.text = Language[11021]
Util.GetGameObject(go, "Value0"):GetComponent("Text").text = userRank.guildName.."("..userRank.rankInfo.param2..")"
Util.GetGameObject(go, "Value0"):GetComponent("Text").text = serverName..userRank.guildName.."("..userRank.rankInfo.param2..")"
end
Util.GetGameObject(go, "Value1"):GetComponent("Text").text = PrintWanNum3(userRank.rankInfo.param1)

View File

@ -425,7 +425,7 @@ function this._TimeUpdate()
end
elseif GuildCarDelayManager.progress == GuildCarDelayProType.Loot then
if PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_LOOT) > 0 then
timeDown = GuildCarDelayManager.ChallengeCdTime
timeDown = GuildCarDelayManager.LootCdTime
if timeDown > 0 then
this.timeText.text = string.format("%s后可抢夺",TimeToMorS(timeDown))
else

View File

@ -209,6 +209,8 @@ function NiuQiChongTianPanel:SetProgress()
elseif self.progressData[i].state == 0 then
if itemConfig[self.progressData[i].reward[1][1]].ItemType == ItemType.SelfBox then
UIManager.OpenPanel(UIName.RewardBoxPanel,nil,self.progressData[i].reward[1][1])
elseif itemConfig[self.progressData[i].reward[1][1]].ItemType == ItemType.Ride then
UIManager.OpenPanel(UIName.RewardRideShowPopup,self.progressData[i].reward[1][1])
else
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,self.progressData[i].reward[1][1],nil)
end
@ -319,4 +321,4 @@ function NiuQiChongTianPanel:OnDestroy()
sortingOrder = 0
end
return NiuQiChongTianPanel
return NiuQiChongTianPanel

View File

@ -209,6 +209,10 @@ function PlayerInfoPopup:BindEvent()
this:ClosePanel()
end)
Util.AddClick(this.addFriendBtn, function()
if this.serverName and this.serverName ~= "" then
PopupTipPanel.ShowTip("无法跨服添加好友")
return
end
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GOODFRIEND) then
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GOODFRIEND))
return
@ -316,7 +320,9 @@ local titleLiveStr
local titleLive
function this.RefreshPlayerInfo(data)
local curname = ""
if this.serverName then
if data.serverName and data.serverName ~= "" then
curname = data.serverName .. " " ..data.name
elseif this.serverName and this.serverName ~= "" then
curname = this.serverName .. " " ..data.name
else
curname = data.name
@ -419,7 +425,7 @@ function this.FormationAdapter(teamInfo)
Util.AddOnceClick(this.Demons[hero.position].frameBtn, function()
NetManager.ViewHeroInfoRequest(this._PlayerId,hero.heroid,netserverName,this._Config.formationType,function(msg)
if not hero.heroid then
return
return
end
heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId)
@ -719,6 +725,10 @@ function this.Report()
end
-- 拉黑
function this.AddToBlackList()
if this.serverName and this.serverName ~= "" then
PopupTipPanel.ShowTip("无法跨服添加黑名单")
return
end
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GOODFRIEND) then
PopupTipPanel.ShowTip(Language[10828])
return