From f8dd59fdfc090f8748d3f684b908e14c23e9e874 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 27 Nov 2020 11:45:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E8=BD=A6=E8=BF=9F=E6=96=97?= =?UTF-8?q?=E6=B3=95=E3=80=91=20=E6=88=91=E7=BC=96=E9=98=9F=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=20=20=E6=88=96=E8=80=85=20=20=E5=AF=B9=E6=96=B9?= =?UTF-8?q?=E7=BC=96=E9=98=9F=E6=88=91=E7=A9=BA=20=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua | 6 +++++- .../Modules/Guild/CarDelay/GuildCarDelayManager.lua | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua index c2ccfb5d91..3297e098d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua @@ -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() diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua index 8278f80e92..b97c3611c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua @@ -26,9 +26,9 @@ end --开始战斗 this.score = 0 this.hurt = 0 -this.heroDid = 0--抢夺是向后端传的id -function this.SetheroDid(_heroDid) - this.heroDid = _heroDid +this.heroDidData = 0--抢夺是向后端传的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.heroDidData and this.heroDidData.teamInfo and #this.heroDidData.teamInfo > 0 then UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.GUILD_CAR_DELAY, callBack) else--抢夺目标阵容为空时 --车迟抢夺cd计时 From 17882656fef193834323f85a801ba6c5adb5d8df Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 27 Nov 2020 15:17:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E7=AB=9E=E6=8A=80=E5=9C=BA?= =?UTF-8?q?=E3=80=91=20=20=E4=BF=AE=E5=A4=8D=E7=A7=AF=E5=88=86=E8=A7=84?= =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9=E5=88=AB=E7=9A=84pvp=20=E6=88=98?= =?UTF-8?q?=E6=96=97=E7=BB=93=E6=9D=9F=E5=90=8E=E6=8A=A5=E9=94=99=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Arena/ArenaRecordPopup.lua | 9 +++++++++ .../~Lua/Modules/Arena/ArenaResultPopup.lua | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua index 244ced79a9..d40025f623 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua @@ -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") diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua index 56885a4858..dd6252505a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua @@ -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 From 6a7c9b920db4e0df17ffd184049f51dc42a2196c Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 27 Nov 2020 16:34:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E8=BD=A6=E8=BF=9F=E6=96=97?= =?UTF-8?q?=E6=B3=95=E3=80=91=20=E4=BF=AE=E6=94=B9=E6=8A=A2=E5=A4=BA=20?= =?UTF-8?q?=E6=8C=91=E6=88=98=E6=97=B6=E4=BC=9A=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua index b97c3611c0..005029f06d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua @@ -26,7 +26,7 @@ end --开始战斗 this.score = 0 this.hurt = 0 -this.heroDidData = 0--抢夺是向后端传的id +this.heroDidData = {}--抢夺是向后端传的id function this.SetheroDid(_heroDidData) this.heroDidData = _heroDidData end @@ -53,7 +53,7 @@ function this.FightBattle( callBack) this.score = msg.score this.hurt = msg.hurt local fightData = BattleManager.GetBattleServerData(msg,fightType) - if this.heroDidData and this.heroDidData.teamInfo and #this.heroDidData.teamInfo > 0 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计时