From 3e625b9fd0b76fda57b916265aa191d26ec863ab Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 31 Mar 2022 09:51:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E8=8B=B1=E9=9B=84=E5=90=88=E6=88=90=EF=BC=8C=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E7=BD=AE=E6=8D=A2=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompoundHero/view/CompoundHero_Compound.lua | 2 +- .../Modules/CompoundHero/view/CompoundHero_Replace.lua | 3 ++- .../Modules/FindTreasure/FindTreasureDispatchPanel.lua | 10 +++++----- .../~Lua/Modules/Popup/RewardGemSingleShowPopup.lua | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua index 8cb2f207a9..eeb8a01d07 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua @@ -17,7 +17,7 @@ function this:InitComponent(gameObject) for i = 1, 4 do needHeros[i] = Util.GetGameObject(gameObject, "CompoundHeroPanel_Compound/titleGo/needHero" .. i) end - for i = 1, 5 do + for i = 1, 6 do tabs[i] = Util.GetGameObject(gameObject, "CompoundHeroPanel_Compound/Tabs/grid/Btn" .. i) end this.selectBtn=Util.GetGameObject(gameObject, "CompoundHeroPanel_Compound/Tabs/selectBtn") diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua index 9137fe4df7..6e8a52d231 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua @@ -189,7 +189,8 @@ function this.GetHeroDataByPosition(_position) local heros = {} local index = 1 for i, v in pairs(HeroManager.ByReplaceHeroGetAllHeros()) do - if v.changeProId == _position or _position == 0 then --0 全职业 + --这里不显示神系的武将 + if v.heroConfig.PropertyName == _position or (_position ==0 and v.heroConfig.PropertyName~=5 ) then --0 全职业 heros[index] = v index = index + 1 end diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua index bcc27a6616..d97a678189 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua @@ -250,7 +250,7 @@ function FindTreasureDispatchPanel:OnShowCardData(go,heroData,type) Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = heroData.lv Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(heroData.icon) -- Util.GetGameObject(go.transform, "posIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(heroData.professionIcon) - Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) + Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId)) --Util.GetGameObject(go.transform, "heroStage"):GetComponent("Image").sprite = self.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage]) -- Util.GetGameObject(go.transform, "heroStage"):SetActive(false) Util.GetGameObject(go.transform, "posIcon"):SetActive(false) @@ -387,7 +387,7 @@ function FindTreasureDispatchPanel:AutoSelectHero() end elseif conFigData.Condition[k][1] == FindTreasureNeedType.Pro then for j, v in pairs(curSelectHeroList) do - if v.heroConfig.PropertyName == conFigData.Condition[k][2] then + if v.changeProId == conFigData.Condition[k][2] then conditionTabs[k] = 1 end end @@ -429,7 +429,7 @@ function FindTreasureDispatchPanel:AutoSelectHeroId(conditionSingleHeros,num) feheNeedNum = feheNeedNum + 1 end elseif conFigData.Condition[j][1] == FindTreasureNeedType.Pro then - if conditionSingleHeros[i].heroConfig.PropertyName == conFigData.Condition[j][2] then + if conditionSingleHeros[i].changeProId == conFigData.Condition[j][2] then feheNeedNum = feheNeedNum + 1 end end @@ -473,7 +473,7 @@ function FindTreasureDispatchPanel:DetectionSelectHeros() end elseif conFigData.Condition[i][1] == FindTreasureNeedType.Pro then for j, v in pairs(curSelectHeroList) do - if v.heroConfig.PropertyName == conFigData.Condition[i][2] then + if v.changeProId == conFigData.Condition[i][2] then conditionTabs[i] = 1 end end @@ -492,7 +492,7 @@ function FindTreasureDispatchPanel:GetConditionHeros() table.insert(curConditionHeros,v) end elseif conFigData.Condition[i][1] == FindTreasureNeedType.Pro then - if v.heroConfig.PropertyName == conFigData.Condition[i][2] then + if v.changeProId == conFigData.Condition[i][2] then table.insert(curConditionHeros,v) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua index c331698737..db1b12878e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua @@ -126,6 +126,7 @@ end function RewardGemSingleShowPopup:OnShow() Log("itemSid:"..tostring(itemSid)) this.itemName.text = GetStringByEquipQua(itemConfigData.Quantity, GetLanguageStrById(itemConfigData.Name)) + LogError(GetStringByEquipQua(itemConfigData.Quantity, GetLanguageStrById(itemConfigData.Name))) this.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..itemConfigData.Quantity) this.howGet:SetActive(false) this.scroll:SetActive(false)