0.1礼包显示修改
parent
359bc9eb72
commit
6c687fc7f7
|
|
@ -3748,6 +3748,86 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5217816522449960790}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &5218355480813963793
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 382325852119376843}
|
||||
- component: {fileID: 3344697848149747366}
|
||||
- component: {fileID: 4078379949508797527}
|
||||
m_Layer: 5
|
||||
m_Name: oriPrice
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &382325852119376843
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5218355480813963793}
|
||||
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:
|
||||
- {fileID: 2711425846003555599}
|
||||
m_Father: {fileID: 8749964550444904214}
|
||||
m_RootOrder: 4
|
||||
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: 170, y: 15}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3344697848149747366
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5218355480813963793}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4078379949508797527
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5218355480813963793}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.7830189, g: 0.05540227, b: 0.05540227, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 5
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 6
|
||||
--- !u!1 &5324204051754447050
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3853,6 +3933,7 @@ RectTransform:
|
|||
- {fileID: 2933429081460937566}
|
||||
- {fileID: 3710269639907010294}
|
||||
- {fileID: 7609100429130394311}
|
||||
- {fileID: 382325852119376843}
|
||||
m_Father: {fileID: 2265465264857924457}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -4116,6 +4197,85 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &5555576199264866189
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2711425846003555599}
|
||||
- component: {fileID: 8555868995561673912}
|
||||
- component: {fileID: 7197540022956283730}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2711425846003555599
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5555576199264866189}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0.08715578, w: 0.9961947}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 382325852119376843}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 10}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8555868995561673912
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5555576199264866189}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7197540022956283730
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5555576199264866189}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.6981132, g: 0.042808846, b: 0.042808846, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 70
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 6
|
||||
m_MaxSize: 70
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u2014\u2014"
|
||||
--- !u!1 &5572201514004700812
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -1197,6 +1197,10 @@ function this:TabBtnAction(id,actType,data)
|
|||
-- UIManager.OpenPanel(UIName.FirstRechargePanel)
|
||||
-- end
|
||||
UIManager.OpenPanel(UIName.FirstRechargePanel)
|
||||
elseif id == 10011 then
|
||||
UIManager.OpenPanel(UIName.ActivityMainPanel,id)
|
||||
elseif id ==ActivityTypeDef.qiandaohaoli then
|
||||
UIManager.OpenPanel(UIName.FestevalPanel)
|
||||
elseif id == ActivityTypeDef.SevenDayCarnival then
|
||||
UIManager.OpenPanel(UIName.SevenDayCarnivalPanelV2,SevenDayCarnivalManager.GetPriorityDayNumber())
|
||||
elseif id == ActivityTypeDef.WarPowerSort then
|
||||
|
|
|
|||
|
|
@ -72,6 +72,8 @@ function GiftPre:InitComponent()
|
|||
self.icon = Util.GetGameObject(self.btnBuy, "icon"):GetComponent("Image")
|
||||
self.price = Util.GetGameObject(self.btnBuy, "price"):GetComponent("Text")
|
||||
self.buyInfo = Util.GetGameObject(self.middleLayout, "buyInfo"):GetComponent("Text")
|
||||
self.oriPrice= Util.GetGameObject(self.middleLayout, "oriPrice")
|
||||
self.oriPriceTxt= Util.GetGameObject(self.middleLayout, "oriPrice"):GetComponent("Text")
|
||||
self.redPoint = Util.GetGameObject(self.btnBuy, "redPoint")
|
||||
|
||||
self.shadow=Util.GetGameObject(self.middleLayout,"shadow")
|
||||
|
|
@ -264,6 +266,19 @@ function GiftPre:SetTag()
|
|||
end
|
||||
--设置礼包限购标签
|
||||
function GiftPre:SetTipTag()
|
||||
self.oriPrice:SetActive(false)
|
||||
--特殊处理0.1商场礼包
|
||||
if self.data.buyType==61 or self.data.buyType==62 then
|
||||
local str="0.1折"
|
||||
self.tipImage.gameObject:SetActive(true)
|
||||
if self.data.data.tipImageText then
|
||||
str=str..self.data.data.tipImageText
|
||||
end
|
||||
self.tipText.text =str
|
||||
self.oriPriceTxt.text=self.data.data.price
|
||||
self.oriPrice:SetActive(true)
|
||||
return
|
||||
end
|
||||
if self.data.data.tipImageText and self.data.data.tipImageText ~= "" then
|
||||
self.tipImage.gameObject:SetActive(true)
|
||||
self.tipText.text = self.data.data.tipImageText
|
||||
|
|
@ -468,7 +483,9 @@ function GiftPre:SetIcon()
|
|||
else
|
||||
self.icon.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
if self.data.buyType==61 or self.data.buyType==62 then
|
||||
self.price.text=self.data.data.finalNum/10 .. "元"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue