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)