From 59a3bdc14d7403ecd466fe872881f929ba70db2b Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Sun, 12 May 2024 21:03:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/MonsterCamp/MonsterCampManager.lua | 2 +- .../ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index 2fb6c227e6..90f565f4a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -740,7 +740,7 @@ end --获取我的助战 function this.GetMyHelpHero(trailType) - if this.myHelpHeroData[trailType] then + if this.myHelpHeroData and this.myHelpHeroData[trailType] then return this.myHelpHeroData[trailType] end return nil diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua index 2cdcf155e0..f0abc0c70f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/WishHeroRewardPopup.lua @@ -124,7 +124,7 @@ function this.SetScrollPre(root,data) getBtn:SetActive(false) local mask=Util.GetGameObject(root,"mask") if type==1 then - info.text="宝箱"..wishData.Level.."级奖励,心愿概率提升为: 传说"..wishData.Weight/100 .."%".." 神话"..wishData.MythWeight/100 .."%" + info.text="宝箱"..wishData.Level.."级奖励,心愿概率提升为:SS伙伴"..wishData.Weight/100 .."%".." SSS伙伴"..wishData.MythWeight/100 .."%" else info.text="宝箱"..wishData.Level.."级奖励,心愿概率提升为:"..wishData.Weight/100 .."%" end