From 49cc691cbbc3a89fdfc50d84d764e6fb441accfa Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Tue, 14 Nov 2023 14:09:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E7=BB=93=E6=9D=9F=E6=89=93?= =?UTF-8?q?=E5=BC=80=E5=9B=9E=E6=94=BE=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua | 2 -- Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua | 1 - .../~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index 1b6cda0106..19a984e50f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -125,8 +125,6 @@ function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType) this.btnBattleBack:SetActive(true) this.btnGrowUp:SetActive(true) end - this.btnGrowUp:SetActive(false) - this.btn_record:SetActive(false) if fightType == BATTLE_TYPE.GUILD_CAR_DELAY then--车迟 --车迟抢夺cd计时 GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 54261aafb1..79a5459598 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -152,7 +152,6 @@ function RewardItemPopup:OnOpen(...) end local haveRecord = BattleRecordManager.isHaveRecord() this.btnResult:SetActive(haveRecord and args[5]) - this.btnResult:SetActive(false) this.btnBattleBack:SetActive(haveRecord and args[5] and BattleManager.GetLastBattleType() ~= BATTLE_TYPE.MAP_FIGHT and not GuideManager.IsInMainGuide() and not MapManager.Mapping and BattleManager.GetLastBattleType() ~= BATTLE_TYPE.TASUILINGXIAO) this.expeditionGo:SetActive(compShowType == 5) this.guildDeathPos:SetActive(compShowType == 4)--十绝阵 diff --git a/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua index 1c6330f5e0..1825c5929c 100644 --- a/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua @@ -102,7 +102,7 @@ function TaSuiLingXiao:ShowLive() self.LiveObj = nil end self.configData = ConfigManager.GetConfigData(ConfigName.NewHeroConfig,self.actData.activityId) - local imgName = GetResourcePath(ConfigManager.GetConfigData(ConfigName.HeroConfig,self.configData.HeroId).Live) + local imgName = GetResourcePath(ConfigManager.GetConfigData(ConfigName.HeroConfig,self.configData.HeroId).Painting) self.LiveObj = poolManager:LoadLive(imgName,self.liveRoot.transform, Vector3.one, Vector2.New(self.configData.Size[2],self.configData.Size[3])) self.liveRoot:GetComponent("RectTransform").localScale = Vector3.one*self.configData.Size[1] end