物品信息界面修改提交
parent
44f87c01d6
commit
45e3afaaaa
|
@ -1579,7 +1579,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 51.699997, y: -0.78998345}
|
m_AnchoredPosition: {x: 111.3, y: -0.78998345}
|
||||||
m_SizeDelta: {x: 160, y: 30}
|
m_SizeDelta: {x: 160, y: 30}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &867443612984388699
|
--- !u!222 &867443612984388699
|
||||||
|
@ -1612,18 +1612,18 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 45
|
m_FontSize: 35
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
m_MaxSize: 45
|
m_MaxSize: 45
|
||||||
m_Alignment: 4
|
m_Alignment: 3
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\xD71"
|
m_Text: 15000
|
||||||
--- !u!1 &2269723892978464456
|
--- !u!1 &2269723892978464456
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -7082,7 +7082,7 @@ ParticleSystem:
|
||||||
--- !u!199 &1856602151176858527
|
--- !u!199 &1856602151176858527
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -13044,7 +13044,7 @@ ParticleSystem:
|
||||||
--- !u!199 &1472261994721625855
|
--- !u!199 &1472261994721625855
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -13626,7 +13626,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -68.04, y: 0}
|
m_AnchoredPosition: {x: -52.6, y: 0}
|
||||||
m_SizeDelta: {x: 79.48, y: 65}
|
m_SizeDelta: {x: 79.48, y: 65}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4357818227745408231
|
--- !u!222 &4357818227745408231
|
||||||
|
@ -13659,7 +13659,7 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 38
|
m_FontSize: 35
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 3
|
m_MinSize: 3
|
||||||
|
@ -13785,7 +13785,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 2.55, y: 0.77}
|
m_AnchoredPosition: {x: -16.3, y: 0.77}
|
||||||
m_SizeDelta: {x: 65, y: 65}
|
m_SizeDelta: {x: 65, y: 65}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &805268058829116413
|
--- !u!222 &805268058829116413
|
||||||
|
@ -19553,7 +19553,7 @@ ParticleSystem:
|
||||||
--- !u!199 &374364804466542659
|
--- !u!199 &374364804466542659
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -24712,7 +24712,7 @@ ParticleSystem:
|
||||||
--- !u!199 &1107171649523788123
|
--- !u!199 &1107171649523788123
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -30218,7 +30218,7 @@ ParticleSystem:
|
||||||
--- !u!199 &8428054502987121459
|
--- !u!199 &8428054502987121459
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
|
@ -337,7 +337,7 @@ end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function RewardItemSingleShowPopup:OnOpen(...)
|
function RewardItemSingleShowPopup:OnOpen(...)
|
||||||
isBagPanel = BagManager.isBagPanel
|
|
||||||
itemNu = 0
|
itemNu = 0
|
||||||
local data = { ... }
|
local data = { ... }
|
||||||
itemSid = data[1]
|
itemSid = data[1]
|
||||||
|
@ -349,6 +349,7 @@ function RewardItemSingleShowPopup:OnOpen(...)
|
||||||
isNoShowSureBtn = data[4] and data[4] or false
|
isNoShowSureBtn = data[4] and data[4] or false
|
||||||
end
|
end
|
||||||
function RewardItemSingleShowPopup:OnShow()
|
function RewardItemSingleShowPopup:OnShow()
|
||||||
|
isBagPanel = BagManager.isBagPanel
|
||||||
this.helpBtn.gameObject:SetActive(false)
|
this.helpBtn.gameObject:SetActive(false)
|
||||||
this.itemName.text = GetStringByEquipQua(itemConfigData.Quantity, GetLanguageStrById(itemConfigData.Name))
|
this.itemName.text = GetStringByEquipQua(itemConfigData.Quantity, GetLanguageStrById(itemConfigData.Name))
|
||||||
this.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..itemConfigData.Quantity)
|
this.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..itemConfigData.Quantity)
|
||||||
|
@ -394,12 +395,14 @@ function RewardItemSingleShowPopup:OnShow()
|
||||||
then
|
then
|
||||||
this.btnSureText.text = Language[10193]
|
this.btnSureText.text = Language[10193]
|
||||||
this.btnSure:SetActive(true)
|
this.btnSure:SetActive(true)
|
||||||
elseif isBagPanel and (itemConfigData.ItemType == ItemType.GMzck
|
elseif isBagPanel and func and
|
||||||
|
(itemConfigData.ItemType == ItemType.GMzck
|
||||||
or itemConfigData.ItemType == ItemType.GMBigZck
|
or itemConfigData.ItemType == ItemType.GMBigZck
|
||||||
or itemConfigData.ItemType == ItemType.GMzcq)
|
or itemConfigData.ItemType == ItemType.GMzcq
|
||||||
or itemConfigData.ItemType == ItemType.GMxck
|
or itemConfigData.ItemType == ItemType.GMxck
|
||||||
or itemConfigData.ItemType == ItemType.GMxjk
|
or itemConfigData.ItemType == ItemType.GMxsZcq
|
||||||
or itemConfigData.ItemType == ItemType.GMxsZcq and func then--是否宝箱可使用
|
or itemConfigData.ItemType == ItemType.GMxjk)
|
||||||
|
then
|
||||||
this.btnSure:SetActive(true)
|
this.btnSure:SetActive(true)
|
||||||
this.btnSureText.text = Language[10195]
|
this.btnSureText.text = Language[10195]
|
||||||
elseif isBagPanel and itemConfigData.ItemType == 10 and func then
|
elseif isBagPanel and itemConfigData.ItemType == 10 and func then
|
||||||
|
@ -621,6 +624,7 @@ function this.SendBackResolveReCallBack(drop, curResolveAllItemList)
|
||||||
end
|
end
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
function RewardItemSingleShowPopup:OnClose()
|
function RewardItemSingleShowPopup:OnClose()
|
||||||
|
isBagPanel=false
|
||||||
PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout = false
|
PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout = false
|
||||||
if this.jumpViewList and #this.jumpViewList > 0 then
|
if this.jumpViewList and #this.jumpViewList > 0 then
|
||||||
for i = 1,#this.jumpViewList do
|
for i = 1,#this.jumpViewList do
|
||||||
|
|
Loading…
Reference in New Issue