Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
jiaoyangna 2021-05-29 21:06:27 +08:00
commit c08a8f2556
4 changed files with 15 additions and 17 deletions

View File

@ -91398,8 +91398,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -34, y: -35}
m_SizeDelta: {x: 59, y: 65}
m_AnchoredPosition: {x: -36.7, y: -30.2}
m_SizeDelta: {x: 79, y: 85}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7031089329870873162
CanvasRenderer:

View File

@ -160,8 +160,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 10, y: -32.5}
m_SizeDelta: {x: 40, y: 45}
m_AnchoredPosition: {x: 5, y: -32.5}
m_SizeDelta: {x: 59, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9115302304514649136
CanvasRenderer:
@ -191,7 +191,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: a584bbaa710fdf84a89d0b2780d93f81, type: 3}
m_Sprite: {fileID: 21300000, guid: b47ba13ec7c5df340aa580bb5505abac, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -253,9 +253,7 @@ function RewardItemSingleShowPopup:OnOpen(...)
if data[2] then
func = data[2]
end
if data[4] then
isNoShowSureBtn = data[4]
end
isNoShowSureBtn = data[4] and data[4] or false
end
function RewardItemSingleShowPopup:OnShow()
this.innateImage:SetActive(false)
@ -281,7 +279,7 @@ function RewardItemSingleShowPopup:OnShow()
this.btnSure:SetActive(false)
this.btnSureText.text = Language[10197]
end
this.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and isBagPanel and isNoShowSureBtn)
this.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and isBagPanel and not isNoShowSureBtn)
Log("itemConfigData.Id " .. itemConfigData.Id)
this.equipQuaText.text = GetStringByEquipQua(itemConfigData.Quantity, GetQuaStringByEquipQua(itemConfigData.Quantity))
this.itemName.text = GetStringByEquipQua(itemConfigData.Quantity, GetLanguageStrById(itemConfigData.Name))

View File

@ -417,7 +417,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true)
end)
elseif itemDataConFig.ItemType == ItemType.Hero then
-- 1角色
@ -455,7 +455,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.fragmentIcon:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(propertyName))
end
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true)
end)
elseif itemDataConFig.ItemType == ItemType.Equip then
--3装备
@ -487,7 +487,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
--self.pokemonFrame:GetComponent("Image").sprite = self.spLoader:LoadSprite(YaoHunFrame[itemConfig[itemSId].Quantity])
--self.pokemonImage.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true)
end)
if effectLayer > 0 then
self.UI_Effect_Kuang_JinSe:SetActive(itemConfig[itemSId].Quantity == 5)
@ -510,7 +510,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true)
end)
if itemDataConFig.RingLevel > 0 then
self.innateImage:SetActive(true)
@ -580,7 +580,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self:SetFrameEffectLayer(effectLayer)
self:SetFrameEffectScale(self.scale * 0.7)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemSId,nil,self.isRewardItemPop,false)
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemSId,nil,self.isRewardItemPop,true)
end)
elseif itemDataConFig.ItemType == ItemType.SelfBox then
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
@ -601,14 +601,14 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
local star = _reward[4] or itemConfig[itemSId].HeroStar[1]
SetHeroStars(self.starGrid, star,1,Vector2.New(32.5,32.5),-15)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true)
end)
else
--5随机道具6符文
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId, nil, self.isRewardItemPop,false)
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId, nil, self.isRewardItemPop,true)
end)
end
if itemNum <= 0 then
@ -665,7 +665,7 @@ function ItemView:OnBtnCkickEvent(itemSId)
--道具自选箱
UIManager.OpenPanel(UIName.RewardBoxPanel,nil,itemDataConFig.Id)
else
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemDataConFig.Id,nil,self.isRewardItemPop,false)
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemDataConFig.Id,nil,self.isRewardItemPop,true)
end
end
function ItemView:OnShowUIeffectItemViewSaoguang()