Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local

dev_chengFeng
gaoxin 2020-11-27 17:28:08 +08:00
commit 15c862fd23
4 changed files with 21 additions and 8 deletions

View File

@ -71,6 +71,8 @@ function this.RankNodeAdapter(node, data)
local result = Util.GetGameObject(node, "result"):GetComponent("Text")
local time = Util.GetGameObject(node, "time"):GetComponent("Text")
local deltaScore = Util.GetGameObject(node, "deltaScore"):GetComponent("Text")
local deltaScoreGo = Util.GetGameObject(node, "deltaScore")
local scoreTipGo = Util.GetGameObject(node, "scoreTip")
lv_name.text = "lv"..data.attackInfo.level.." "..data.attackInfo.name
integral.text = data.attackInfo.score
@ -96,6 +98,13 @@ function this.RankNodeAdapter(node, data)
deltaScore.text = scoreStr
result.color = color
deltaScore.color = color
if data.myScoreChange == 0 then
deltaScoreGo:SetActive(false)
scoreTipGo:SetActive(false)
else
deltaScoreGo:SetActive(true)
scoreTipGo:SetActive(true)
end
-- 给回放按钮添加事件
local replay = Util.GetGameObject(node, "replay")

View File

@ -105,7 +105,7 @@ function ArenaResultPopup:OnOpen(_args,_fun)
redHeadIcon:GetComponent("Image").sprite = GetPlayerHeadSprite(redInfo.head)
redHeadBg:GetComponent("Image").sprite = GetPlayerHeadFrameSprite(redInfo.frame)
LogYellow("奖励Id:"..args.reward.itemlist[1].itemId.." 奖励数量:"..args.reward.itemlist[1].itemNum)
-- LogYellow("奖励Id:"..args.reward.itemlist[1].itemId.." 奖励数量:"..args.reward.itemlist[1].itemNum)
if args.reward then
reward:SetActive(true)
rewardIcon.sprite = Util.LoadSprite(artConfig[itemConfig[rewardData.id].ResourceID].Name)
@ -118,7 +118,7 @@ function ArenaResultPopup:OnOpen(_args,_fun)
blueScore:SetActive(true)
local blueScoreColor = bScore >= 0 and UIColorStr.GREEN or UIColorStr.RED
local blueScoreStr = bScore >= 0 and "+"..bScore or bScore
blueScore:GetComponent("Text").text = string.format(Language[10093], blueScoreColor, blueScoreStr)
blueScore:GetComponent("Text").text = bScore ~= 0 and string.format(Language[10093], blueScoreColor, blueScoreStr) or ""
else
blueScore:SetActive(false)
end

View File

@ -134,7 +134,11 @@ function this.SingleInfoDataShow(go,data)
end
--抢夺点击事件
Util.AddOnceClick(Util.GetGameObject(go, "lootBtn"), function()
GuildCarDelayManager.SetheroDid(data.uid)
GuildCarDelayManager.SetheroDid(data)
local formationTeamHeros = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.GUILD_CAR_DELEAY)
if LengthOfTable(formationTeamHeros) <= 0 then
FormationManager.GetFormationByID(FormationTypeDef.GUILD_CAR_DELEAY)
end
if data.teamInfo and #data.teamInfo > 0 then
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.GUILD_CAR_DELEAY)
this:ClosePanel()

View File

@ -26,9 +26,9 @@ end
--开始战斗
this.score = 0
this.hurt = 0
this.heroDid = 0--抢夺是向后端传的id
function this.SetheroDid(_heroDid)
this.heroDid = _heroDid
this.heroDidData = {}--抢夺是向后端传的id
function this.SetheroDid(_heroDidData)
this.heroDidData = _heroDidData
end
function this.FightBattle( callBack)
local type = 0
@ -43,7 +43,7 @@ function this.FightBattle( callBack)
type = 1
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_CHALLENGE, 1)
elseif this.progress == GuildCarDelayProType.Loot then
monsterId = this.heroDid
monsterId = this.heroDidData.uid
fightType = 1
type = 2
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_LOOT, 1)
@ -53,7 +53,7 @@ function this.FightBattle( callBack)
this.score = msg.score
this.hurt = msg.hurt
local fightData = BattleManager.GetBattleServerData(msg,fightType)
if fightData.fightData.enemyData[1] and LengthOfTable(fightData.fightData.enemyData[1]) > 4 then
if (this.progress == GuildCarDelayProType.Loot and this.heroDidData and this.heroDidData.teamInfo and #this.heroDidData.teamInfo > 0) or this.progress == GuildCarDelayProType.Challenge then
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.GUILD_CAR_DELAY, callBack)
else--抢夺目标阵容为空时
--车迟抢夺cd计时