Merge branch 'china/dev_bt_develop_faxiang' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop_faxiang

dev_chengFeng
wangzhenxing 2023-02-18 15:57:37 +08:00
commit 8cb653fcb4
5 changed files with 21 additions and 5 deletions

View File

@ -2620,6 +2620,7 @@ ItemBaseType = {
GodPrint = 10, --神印
TurnsCard=11,--变身卡
Talisman = 12, --法宝
FaXiang = 13, --法相
}
--探宝类型
TreasureType={

View File

@ -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

View File

@ -270,6 +270,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)
@ -611,6 +612,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

View File

@ -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

View File

@ -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))