主角礼物星级显示修改提交

PC-202302260912\Administrator 2024-04-10 18:50:38 +08:00
parent 55820abdb2
commit f0fb44c1be
4 changed files with 45 additions and 10 deletions

View File

@ -4850,7 +4850,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -35.12, y: -50.382}
m_AnchoredPosition: {x: -35.12, y: 49.4}
m_SizeDelta: {x: 61.84, y: 27.336}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222622639373068266
@ -74234,12 +74234,12 @@ PrefabInstance:
propertyPath: m_MaskInteraction
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8904198713310030723, guid: bd194af093bc5564ba7ae00a6f664c2d,
- target: {fileID: 8904198713800480830, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_MaskInteraction
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8904198713654882537, guid: bd194af093bc5564ba7ae00a6f664c2d,
- target: {fileID: 8904198714661017609, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_MaskInteraction
value: 1
@ -74249,12 +74249,12 @@ PrefabInstance:
propertyPath: m_MaskInteraction
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8904198713800480830, guid: bd194af093bc5564ba7ae00a6f664c2d,
- target: {fileID: 8904198713654882537, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_MaskInteraction
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8904198714661017609, guid: bd194af093bc5564ba7ae00a6f664c2d,
- target: {fileID: 8904198713310030723, guid: bd194af093bc5564ba7ae00a6f664c2d,
type: 3}
propertyPath: m_MaskInteraction
value: 1

View File

@ -4279,7 +4279,7 @@ end
function this.GetHeroPotencyAddByTypeAndPotencyData(_data,_type)
if _data and _type and _data[_type] then
local aaa=_data[_type]
local allLv=aaa.lv+aaa.giftLv+TianShuMiJuanManger.GetAddPotentialLV()
local allLv=aaa.lv+aaa.giftLv--+TianShuMiJuanManger.GetAddPotentialLV()
local config=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PotentialNew,"Type",_type,"Level",allLv)
if config then
local pro=config.Attribute/10000

View File

@ -14,6 +14,7 @@ local curHeroData=nil
local teamHero
local v1
local allUpIds={}
local upSuitId={}
--初始化组件用于子类重写RoleEquipChangePopup
function PlayerGiftPanel:InitComponent()
this.spLoader = SpriteLoader.New()
@ -180,6 +181,7 @@ function this.RefreshWindowData()
end
local giftDatas={}
allUpIds={}
upSuitId={}
for i=1,maxNum do
local data={}
data.type=1
@ -195,6 +197,7 @@ function this.RefreshWindowData()
LogError("equipConfig[data.id].Gift=="..equipConfig[data.id].Gift)
end
table.insert(allUpIds,data.id)
table.insert(upSuitId,equipConfig[data.id].SuiteID)
else
data.isRed=GiftManager.CheckPlayerRedPoint()
end
@ -276,20 +279,24 @@ function this.SingleUpItemShow(_go,data)
local name=Util.GetGameObject(_go,"name"):GetComponent("Text")
local add=Util.GetGameObject(_go,"add")
local red=Util.GetGameObject(_go,"red")
local starGrid=Util.GetGameObject(_go,"starGrid")
red:SetActive(data.isRed)
if data.id and data.id~=0 then
frame.sprite=this.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[data.id].Quantity))
icon.gameObject:SetActive(true)
name.gameObject:SetActive(true)
starGrid:SetActive(true)
add:SetActive(false)
name.text=itemConfig[data.id].Name
icon.sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[data.id].ResourceID))
SetHeroStars(this.spLoader,starGrid,equipConfig[data.id].Star,1,nil,-15)
Util.AddOnceClick(icon.gameObject,function()
BagManager.isBagPanel=false
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2,this,data,0,false,nil,nil,4)
end
)
else
starGrid:SetActive(false)
frame.sprite=this.spLoader:LoadSprite("r_characterbg_blue")
icon.gameObject:SetActive(false)
name.gameObject:SetActive(false)
@ -310,7 +317,7 @@ function this:OnClickTabBtn(_index)
local count = 0
for i=1,#allEquip do
count = count + 1
if CheckListIsContainValue1(allUpIds,allEquip[i].id) then
if CheckListIsContainValue1(allUpIds,allEquip[i].id) or CheckListIsContainValue1(upSuitId,equipConfig[allEquip[i].id].SuiteID) then
allEquip[i].isUp=1
else
allEquip[i].isUp=2
@ -364,7 +371,7 @@ function this.SingleItemDataShow(_go, _itemData)
local redPoint = Util.GetGameObject(_go.transform, "redPoint")
local tip=Util.GetGameObject(_go.transform, "tip")
tip:SetActive(_itemData.isUp==1)
local isHave=CheckListIsContainValue1(allUpIds,_itemData.id)
local isHave=CheckListIsContainValue1(allUpIds,_itemData.id) or CheckListIsContainValue1(upSuitId,equipConfig[_itemData.id].SuiteID)
redPoint:SetActive(isHave==false)
this.equipPreList[_go].gameObject:SetActive(true)
this.equipPreList[_go].transform:SetAsFirstSibling()

View File

@ -336,6 +336,22 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
end)
elseif _itemData.configData.ItemType == 56 then --装备
--hero
self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById(_itemData.configData.ReadingName),5)
self.heroShowGo:SetActive(false)
self.starGrid:SetActive(true)
self.resetLvText.gameObject:SetActive(true)
if _itemData.configData.ItemBaseType==14 then
self.resetLvText.text="主角"
elseif _itemData.configData.ItemBaseType==15 then
self.resetLvText.text="英雄"
end
LogError("equipConfig[_itemData.sId].Star=="..equipConfig[_itemData.sId].Star)
SetHeroStars(self.spLoader, self.starGrid, equipConfig[_itemData.sId].Star,1,Vector2.New(32.5,32.5),-15)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
end)
else
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
@ -375,7 +391,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
elseif _itemData.configData.ItemBaseType==15 then
self.resetLvText.text=""
end
SetHeroStars(self.spLoader, self.starGrid, 0,1,Vector2.New(32.5,32.5),-15)
LogError("equipConfig[_itemData.sId].Star=="..equipConfig[_itemData.sId].Star)
SetHeroStars(self.spLoader, self.starGrid, equipConfig[_itemData.sId].Star,1,Vector2.New(32.5,32.5),-15)
else
SetHeroStars(self.spLoader, self.starGrid, _itemData.backData.star,1,Vector2.New(32.5,32.5),-15)
end
@ -467,6 +484,11 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardRideShowPopup, _itemData.backData.itemId,nil)
end)
elseif _itemData.itemType == ItemType.Talisman then--
Util.AddOnceClick(self.frameBtn, function()
--UIManager.OpenPanel(UIName.RewardRideShowPopup, _,nil)
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.equipId,nil,self.isRewardItemPop,true)
end)
elseif _itemData.ItemType == ItemType.Gem then
if _itemData.isReplace then
self.upImg:SetActive(true)
@ -673,7 +695,13 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
elseif itemDataConFig.ItemBaseType==15 then
self.resetLvText.text=""
end
self.starGrid:SetActive(false)
local star=0
if equipConfig[itemSId] then
star=equipConfig[itemSId].Star
end
--self.starGrid:SetActive(false)
LogError("star=============================="..star)
SetHeroStars(self.spLoader, self.starGrid, star,1,nil,-15)
end
Util.AddOnceClick(self.frameBtn, function()
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemSId)