From c2f2f9255b9c253717f1a630bf1dd4a7d78fe199 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Sat, 18 Feb 2023 15:52:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E7=9B=B8=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua | 7 ++++--- .../Modules/Popup/RewardTalismanSingleShowPopup2.lua | 6 ++++++ .../~Lua/Modules/Popup/RoleInfoPopup.lua | 2 +- .../~Lua/Modules/RoleInfo/FaXiangHandBook.lua | 10 +++++++++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 3e570006f2..837a47ca03 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2620,6 +2620,7 @@ ItemBaseType = { GodPrint = 10, --神印 TurnsCard=11,--变身卡 Talisman = 12, --法宝 + FaXiang = 13, --法相 } --探宝类型 TreasureType={ diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 299b0d9d95..71a7a8b516 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -274,8 +274,9 @@ function this.OnClickTabBtn(_index, _clickBtn, isTop,isNotAni,_tabIndex) elseif(_index == ItemBaseType.Talisman)then itemData = BagManager.GetItemDataByItemType(ItemBaseType.Talisman) this:SetItemData(itemData, isTop,isNotAni) - elseif(_index == 13)then - itemData = BagManager.GetItemDataByItemType(ItemType.FaXiang) + elseif(_index == ItemBaseType.FaXiang)then + itemData=FaXiangManager.GetAllTreasures() + -- itemData = BagManager.GetItemDataByItemType(ItemType.FaXiang) this:SetItemData(itemData, isTop,isNotAni) else LogError("获取背包物品") @@ -606,7 +607,7 @@ function this.SingleItemDataShow(_go, _itemData) -- UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 0, _itemData.idDyn,_itemData.id, _itemData.lv,_itemData.refineLv, function() -- this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true) -- end) - UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,_itemData,1,true,true,nil,nil,nil,function() + UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,_itemData,1,true,true,nil,0,nil,function() this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true) end) elseif _itemData.itemConfig.ItemBaseType == ItemBaseType.SoulPrint then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua index f0d1cfe678..b1f39c7721 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua @@ -265,6 +265,7 @@ function RewardTalismanSingleShowPopup2:OnOpen(_parent,_equipData,_openType,_isS end function RewardTalismanSingleShowPopup2:SetBtns() + Log("self.equipData.id:"..self.equipData.id) local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, tonumber(self.equipData.id)) self.btnSure:SetActive(itemConfigData.IfResolve==1 and BagManager.isBagPanel) self.btnJump:SetActive(BagManager.isBagPanel) @@ -606,6 +607,11 @@ function RewardTalismanSingleShowPopup2:GongMingSetData(curTabIndex,proPreList,g --获取穿戴宝物强化/精炼的最小等级 local minLv--最小等级 local maxlv --最大等级 + if self.curHeroData==nil then + self.baseMaster:SetActive(false) + self.refineMaster:SetActive(false) + return + end if #self.curHeroData.jewels < 2 then go.gameObject:SetActive(false) return diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 18f62bab9c..6d783704c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -492,7 +492,7 @@ function this.EquipInfo() Util.AddOnceClick(btn,function() if did and data then -- UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,2,curHeroData,data,nil,pos,0) - UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,data,0,false,nil,curHeroData,pos) + UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,data,0,false,nil,curHeroData,5) end end) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangHandBook.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangHandBook.lua index d80948b44f..b361ef5ff6 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangHandBook.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangHandBook.lua @@ -149,7 +149,15 @@ function this.SetScrollPre(root,data) local icon=Util.GetGameObject(root,"circleFrameBg/Icon"):GetComponent("Image") local name=Util.GetGameObject(root,"Name"):GetComponent("Text") Util.AddOnceClick(root,function() - UIManager.OpenPanel(UIName.GodPrintPopUp,0,nil,data.Id,nil) + -- UIManager.OpenPanel(UIName.GodPrintPopUp,0,nil,data.Id,nil) + local equipData={} + equipData.id=data.Id + local faxiangConfig=ConfigManager.GetConfigData(ConfigName.FaxiangConfig,data.Id) + equipData.levelPool=faxiangConfig.LevelUpPool + equipData.lv=100 + equipData.maxLv=100 + equipData.refineLv=3 + UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,equipData,0,false,nil,nil,7) end) frame.sprite=this.spLoader:LoadSprite(GetQuantityImageByquality(data.Quantity))