英雄礼物修改

hotfix/xiyou/cdn_xiyouTest_and/1.1.4
PC-202302260912\Administrator 2024-04-11 15:16:26 +08:00
parent 7ad021bebd
commit 9762bfbfb8
2 changed files with 58 additions and 4 deletions

View File

@ -7340,6 +7340,41 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &3407434671954707848
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5211646291376015345}
m_Layer: 5
m_Name: starGrid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5211646291376015345
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3407434671954707848}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4030141169353930138}
m_RootOrder: 6
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: 0.000059128, y: -54.3}
m_SizeDelta: {x: 148, y: 41.29}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3479059982445481411
GameObject:
m_ObjectHideFlags: 0
@ -27457,6 +27492,7 @@ RectTransform:
- {fileID: 93176600912324672}
- {fileID: 9006106716132168990}
- {fileID: 744661731550951672}
- {fileID: 5211646291376015345}
m_Father: {fileID: 4072935318317542415}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -14,6 +14,7 @@ local curHeroData=nil
local teamHero
local v1
local allUpIds={}
local upSuitId={}
local allEquip={}
local index=0
local lv,curNum,maxNum
@ -133,10 +134,14 @@ function RoleGiftPanel:BindEvent()
local canNum=curNum-#allUpIds
if canNum>0 then
local list={}
table.sort(allEquip,function(a,b)
return equipConfig[a.id].ExhibitionScore>equipConfig[b.id].ExhibitionScore
end)
for i=1,#allEquip do
if i<=canNum then
if CheckListIsContainValue1(allUpIds,allEquip[i].id)==false then
if CheckListIsContainValue1(allUpIds,allEquip[i].id)==false and CheckListIsContainValue1(upSuitId,equipConfig[allEquip[i].id].SuiteID)==false then
table.insert(list,allEquip[i].id)
table.insert(upSuitId,equipConfig[allEquip[i].id].SuiteID)
end
end
end
@ -223,11 +228,19 @@ function this.RefreshWindowData()
--显示上面赠送的
local list=GiftManager.GetHeroGifts(curHeroData.dynamicId)
lv,curNum,maxNum=GiftManager.GetCollectLvAndNum()
if #list>=50 then
curNum=#list+6
maxNum=#list+6
else
curNum=50
maxNum=50
end
this.lvTxt.text="收集度"..lv..""
LogError("lv========="..lv.." curnum=="..curNum.." maxNum=="..maxNum)
--maxNum=0
local giftDatas={}
allUpIds={}
upSuitId={}
for i=1,maxNum do
local data={}
data.type=1
@ -239,6 +252,7 @@ function this.RefreshWindowData()
data.id=list[i]
data.qua=itemConfig[list[i]].Quantity
table.insert(allUpIds,data.id)
table.insert(upSuitId,equipConfig[data.id].SuiteID)
else
data.isRed=GiftManager.CheckRoleRedPointById(curHeroData.dynamicId)
end
@ -312,17 +326,19 @@ function this.SingleUpItemShow(_go,data,_index)
local lockText=Util.GetGameObject(_go,"Text"):GetComponent("Text")
local add=Util.GetGameObject(_go,"add")
local red=Util.GetGameObject(_go,"red")
local starGrid=Util.GetGameObject(_go,"starGrid")
if data.id and data.id~=0 then
red:SetActive(false)
frame.sprite=this.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[data.id].Quantity))
icon.gameObject:SetActive(true)
name.gameObject:SetActive(true)
lockObj:SetActive(false)
starGrid:SetActive(true)
lockText.gameObject:SetActive(false)
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()
if curHeroData==nil then
return
@ -335,6 +351,7 @@ function this.SingleUpItemShow(_go,data,_index)
frame.sprite=this.spLoader:LoadSprite("r_characterbg_blue")
icon.gameObject:SetActive(false)
name.gameObject:SetActive(false)
starGrid:SetActive(false)
if _index>curNum then
lockObj:SetActive(true)
add:SetActive(false)
@ -363,7 +380,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
@ -417,10 +434,11 @@ 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 and curNum>#allUpIds)
this.equipPreList[_go].gameObject:SetActive(true)
this.equipPreList[_go].transform:SetAsFirstSibling()
this.equipPreList[_go]:ResetNameColor(Color.New(178/255,85/255,55/255,1))
--if itemConfig[_itemData.id].ItemType == ItemType.Equip then
this.equipPreList[_go]:OnOpen(false,{_itemData.id,_itemData.num}, 1.1, true, false, false, this.sortingOrder+1,_itemData.idDyn)
-- 0.查看属性 1.穿戴 2.卸下 3.交换