修改提交

dev_chengFeng
jiaoyangna 2021-11-27 14:30:51 +08:00
parent 767d4589c7
commit 0c6ff17ddd
7 changed files with 36660 additions and 36657 deletions

View File

@ -22573,7 +22573,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -453.95, y: 0.00000030921947}
m_AnchoredPosition: {x: -453.95, y: 0}
m_SizeDelta: {x: 907.9, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &4260212251028292622
@ -24593,7 +24593,7 @@ MonoBehaviour:
m_Top: 14
m_Bottom: 69
m_ChildAlignment: 4
m_Spacing: 110
m_Spacing: 73
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0

View File

@ -625,7 +625,7 @@ MonoBehaviour:
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 1
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 36
@ -1634,7 +1634,7 @@ MonoBehaviour:
m_Left: 0
m_Right: 0
m_Top: 60
m_Bottom: 0
m_Bottom: 29
m_ChildAlignment: 0
m_Spacing: 60
m_ChildForceExpandWidth: 0
@ -1960,7 +1960,7 @@ MonoBehaviour:
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 1
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
@ -1970,7 +1970,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u52A0\u6210\u5C5E\u6027\uFF1A"
m_Text: "\u5168\u4F53\u795E\u5C06\u5C5E\u6027\u52A0\u6210\uFF1A"
LanguageIndex: 0
--- !u!1 &7270151132506234573
GameObject:
@ -2288,7 +2288,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.2
m_Text:
m_Text: fasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasdasd
--- !u!114 &5887821664597300103
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -553,6 +553,7 @@ UpViewRechargeType = {
jingwenmiyao = 104, --镜纹密钥
godEquipStone= 1258,--神装觉醒石
LingMaiCoin = 1273,--灵脉币
yonghengzhiyao = 1287,
}
SHOP_PAGE = {

View File

@ -98,7 +98,7 @@ function this:RefreshData()
end
itemList[i].items[j].go.gameObject:SetActive(true)
itemList[i].items[j].item:OnOpen(false,{self.curData[i].trumpChipList[j],0}, 1.1, true, false, false, sortingOrder + 1)
itemList[i].items[j].lv.text = TailsManSoulManager.GetTailsmanLvById(self.curData[i].trumpChipList[j])
itemList[i].items[j].lv.text = TailsManSoulManager.GetTailsmanLvById(self.curData[i].trumpList[j].id)
itemList[i].items[j].select.gameObject:SetActive(this:CheckIsSelect(self.curData[i].trumpChipList[j]))
Util.AddOnceClick(itemList[i].items[j].pos,function()
if this:CheckIsSelect(self.curData[i].trumpChipList[j]) then

View File

@ -261,7 +261,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
local star = _itemData.configData.HeroStar[1]
SetHeroStars(self.spLoader,self.starGrid, star,1,Vector2.New(32.5,32.5),-15)
elseif _itemData.configData.ItemType == ItemType.talismanSoulChip then
-- self.num:SetActive(false)
self.num:SetActive(true)
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[_itemData.backData.itemId].Quantity))
self.frameMask:SetActive(true)
self.frameMask:GetComponent("Image").sprite = self.spLoader:LoadSprite("f_fabaojuling_zijiemianfabaokuang1")
@ -588,7 +588,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0,0)
end)
elseif itemDataConFig.ItemType == ItemType.talismanSoulChip then
self.num:SetActive(false)
self.num:SetActive(true)
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
self.frameMask:SetActive(true)
self.frameMask:GetComponent("Image").sprite = self.spLoader:LoadSprite("f_fabaojuling_zijiemianfabaokuang1")

View File

@ -64,6 +64,7 @@ local _ShowPlusType = {
UpViewRechargeType.jingwenmiyao,
UpViewRechargeType.godEquipStone,
UpViewRechargeType.LingMaiCoin,
UpViewRechargeType.yonghengzhiyao,
}
-- 判断是否显示加号
@ -398,7 +399,8 @@ function UpView:RechargeType(_type)
_type == UpViewRechargeType.jingwenmiyao or
_type == UpViewRechargeType.TaichuZhiQi or
_type == UpViewRechargeType.LingMaiCoin or
_type == UpViewRechargeType.godEquipStone then
_type == UpViewRechargeType.godEquipStone or
_type == UpViewRechargeType.yonghengzhiyao then
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type)
end
end