From 4b54b188ab098cb8045c3402d556b99276935ca2 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Thu, 16 May 2024 14:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E9=AD=94=E8=AF=95=E7=82=BC=E5=85=B3?= =?UTF-8?q?=E5=8D=A1=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9=20=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=B8=B8=E8=A7=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 61a7e6f22484a2e9b4c3dcd2f6e020cd0748d829) --- .../~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua | 3 ++- .../~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua | 4 +++- .../ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index 98ab5a7909..dca27aa83a 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -199,7 +199,8 @@ function this.InitMonsterShow() this.singledataList[monsterInfo[index].wave] = tempData --this.singlePreList[go] = this.singledataList[monsterInfo[index].wave] end,true,true) - this.scrollView:SetIndex(#monsterInfo - curwaves - 1) + --this.scrollView:SetIndex(#monsterInfo - curwaves - 1) + this.scrollView:SetIndex(10) -- if MonsterCampManager.CurOffsetIndex < 0 then -- this.scrollView:SetIndex((#monsterInfo-trailData.monsterWave-2)) -- else diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua index e1c8ceba29..2f69b42480 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua @@ -228,7 +228,9 @@ function this.InitMonsterShow() local tempData = this.SingleDataShow(go, monsterInfo[index]) this.singledataList[monsterInfo[index].Id] = tempData end,true,true) - this.scrollView:SetIndex(#monsterInfo - MonsterCampManager.monsterWave - 1) + LogError("#monsterInfo=="..#monsterInfo.." MonsterCampManager.monsterWave=="..MonsterCampManager.monsterWave) + --this.scrollView:SetIndex(#monsterInfo - MonsterCampManager.monsterWave - 1) + this.scrollView:SetIndex(10) end --界面关闭时调用（用于子类重写） diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 2a6f6683bd..276905480c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -154,7 +154,7 @@ function RewardItemPopup:OnOpen(...) --self:ClosePanel() return end - this.rewardBG:SetActive(#drop.itemlist>0) + this.rewardBG:SetActive(drop and #drop.itemlist>0) local haveRecord = BattleRecordManager.isHaveRecord() this.btnResult:SetActive(haveRecord and args[5]) 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)