diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua
index 2b3c422b01..a36e4f24d0 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua
@@ -475,7 +475,7 @@ function RewardTalismanSingleShowPopup2:OnShow()
ForceRebuildLayout(self.midBar.transform)
- local maxHeight = self.isShowGet and 250 or 850
+ local maxHeight = self.isShowGet and 850 or 850
local sizeDelta = GetPreferredHeight(self.midBar.transform)
if sizeDelta >= maxHeight then
self.mid:GetComponent("LayoutElement").minHeight = maxHeight
@@ -506,13 +506,13 @@ function RewardTalismanSingleShowPopup2:SetSkillShow(_infos,_preList,_grid,_lv)
local str=""
if self.position >6 then
if value.lv<=_lv then
- str=""..proper.Desc.." ("..value.lv.."星解锁)"..""
+ str=""..proper.Desc.." ("..value.lv.."星解锁)"..""
else
str=""..proper.Desc.." ("..value.lv.."星解锁)"..""
end
else
if value.lv<=_lv then
- str=""..proper.Desc.." (精炼"..value.lv.."级解锁)"..""
+ str=""..proper.Desc.." (精炼"..value.lv.."级解锁)"..""
else
str=""..proper.Desc.." (精炼"..value.lv.."级解锁)"..""
end
@@ -559,10 +559,12 @@ function RewardTalismanSingleShowPopup2:SetPropertyShow1(_infos,_preList,_grid)
local potencyAdd=HeroManager.GetHeroPotencyAddByTypeAndPotencyData(self.curHeroData.potential,self.position)
LogError("potencyAdd============"..potencyAdd)
- str = str..GetLanguageStrById(proper.Info).."+".. value.currValue..string.format(" 潜能 +%s(%s%%)",math.floor(value.currValue*(potencyAdd)+0.5),potencyAdd*100)
+ str = str..GetLanguageStrById(proper.Info).."+".. value.currValue..string.format(" 潜能 +%s(%s%%)",math.floor(value.currValue*(potencyAdd)+0.5),potencyAdd*100)
else
-
+ --str = str..GetLanguageStrById(proper.Info).."+".. value.currValue..string.format(" 潜能 +%s(%s%%)",0,0)
end
+ else
+ str = str..GetLanguageStrById(proper.Info).."+".. value.currValue..string.format(" 潜能 +%s(%s%%)",0,0)
end
obj.transform:GetComponent("Text").text=str
obj.gameObject:SetActive(true)
diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua
index ddf59d3d37..185f6ac8f5 100644
--- a/Assets/ManagedResources/~Lua/View/ItemView.lua
+++ b/Assets/ManagedResources/~Lua/View/ItemView.lua
@@ -811,7 +811,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.SoulPrintPopUp,0,nil,itemSId,nil,nil)
end)
- elseif itemDataConFig.ItemType == ItemType.EquipTreasure then
+ elseif itemDataConFig.ItemType == ItemType.EquipTreasure then
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
self.fragmentIcon:SetActive(true)
@@ -861,6 +861,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
end
end
Util.AddOnceClick(self.frameBtn, function()
+
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0,0)
end)
elseif itemDataConFig.ItemType == ItemType.FaXiang then
@@ -900,9 +901,17 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
end
end
end
- -- Util.AddOnceClick(self.frameBtn, function()
- -- UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0,0)
- -- end)
+ Util.AddOnceClick(self.frameBtn, function()
+ local equipData={}
+ equipData.id=itemSId
+ local faxiangConfig=ConfigManager.GetConfigData(ConfigName.FaxiangConfig,itemSId)
+ equipData.levelPool=faxiangConfig.LevelUpPool
+ equipData.lv=0
+ equipData.maxLv=faxiangConfig.LevelMax
+ equipData.refinePool=faxiangConfig.Star
+ equipData.refineLv=0
+ UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,nil,equipData ,0,0,0,nil,7)
+ end)
elseif itemDataConFig.ItemType == ItemType.LingShou then
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))