From 9585e203c3b066d59eefdabe8e9670edd64a9330 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Tue, 26 Mar 2024 17:50:02 +0800 Subject: [PATCH] =?UTF-8?q?0.1=E6=8A=98=E5=95=86=E5=BA=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/NewActivity/GiftPre.prefab | 198 ++++++++++++++++-- .../View/GeneralBigPopup_GiveLikeHotHero.lua | 2 +- .../~Lua/Modules/Recharge/View/GiftPre.lua | 19 +- 3 files changed, 198 insertions(+), 21 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/GiftPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/GiftPre.prefab index ec03db1952..72a2e7c64f 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/GiftPre.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/GiftPre.prefab @@ -1192,9 +1192,9 @@ RectTransform: m_Father: {fileID: 7731958902547954343} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 80, y: -33} m_SizeDelta: {x: 0, y: 46} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7607199292195836623 @@ -1368,7 +1368,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 140, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 61.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &170924767488423321 @@ -1507,6 +1507,85 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9AD8\u7EA7\u793C\u5305\u5185\u542B\u9AD8\u7EA7\u5BFB\u5B9D\u7279\u6743\uFF0C\u6BCF\u5929" LanguageIndex: 0 +--- !u!1 &1609853544210134539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8146288515705434719} + - component: {fileID: 3190385187346846145} + - component: {fileID: 3935274084514041832} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8146288515705434719 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609853544210134539} + 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: 6433499486909846603} + 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 &3190385187346846145 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609853544210134539} + m_CullTransparentMesh: 0 +--- !u!114 &3935274084514041832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1609853544210134539} + 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.8117647, g: 0.06666667, b: 0.06666667, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 5 + m_MaxSize: 60 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u2014\u2014" --- !u!1 &1821304379437847791 GameObject: m_ObjectHideFlags: 0 @@ -1851,9 +1930,9 @@ RectTransform: m_Father: {fileID: 6593920490965261590} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 571, y: -36} m_SizeDelta: {x: 760, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &506710367147554545 @@ -2115,7 +2194,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1375.6, y: -36} + m_AnchoredPosition: {x: 486.6, y: -36} m_SizeDelta: {x: 591.2, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6405926517718095102 @@ -3000,8 +3079,8 @@ RectTransform: 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: -4, y: 13} - m_SizeDelta: {x: 192.06, y: 85.43} + m_AnchoredPosition: {x: -4, y: 1.08} + m_SizeDelta: {x: 192.1, y: 61.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2785025188702477686 CanvasRenderer: @@ -3033,18 +3112,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 50 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 5 + m_MinSize: 3 m_MaxSize: 50 - m_Alignment: 7 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6C38\u4E45\u9650\u8D2D" + m_Text: "0.1\u6298\u6BCF\u5468\u9650\u8D2D" LanguageIndex: 0 --- !u!1 &4290577196243320286 GameObject: @@ -3126,6 +3205,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5468\u9650\u8D2D\u4E00\u6B21\uFF01" LanguageIndex: 0 +--- !u!1 &4394521638382545036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6433499486909846603} + - component: {fileID: 2601150122451972870} + - component: {fileID: 6514755118469038409} + m_Layer: 5 + m_Name: oriPrice + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6433499486909846603 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394521638382545036} + 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: 8146288515705434719} + 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: 174.6, y: 14} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2601150122451972870 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394521638382545036} + m_CullTransparentMesh: 0 +--- !u!114 &6514755118469038409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4394521638382545036} + 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.8113208, g: 0.06505875, b: 0.06505875, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + 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 &4482142468474848191 GameObject: m_ObjectHideFlags: 0 @@ -3871,6 +4030,7 @@ RectTransform: - {fileID: 2933429081460937566} - {fileID: 3710269639907010294} - {fileID: 7609100429130394311} + - {fileID: 6433499486909846603} m_Father: {fileID: 2265465264857924457} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5252,10 +5412,10 @@ RectTransform: m_Father: {fileID: 7731958902547954343} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 80, y: 0} - m_SizeDelta: {x: 0, y: 46} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 80, y: -33} + m_SizeDelta: {x: 12, y: 46} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8379782961658539162 CanvasRenderer: @@ -5600,7 +5760,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 700, y: -36} + m_AnchoredPosition: {x: 571, y: -36} m_SizeDelta: {x: 760, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7841246522865599536 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua index 3f712ec09b..a7a65baa09 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralBigPopup_GiveLikeHotHero.lua @@ -21,7 +21,7 @@ local TabBox = require("Modules/Common/TabBox") local _TabData={ -- [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "人气热榜" }, -- [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "山河社稷图" }, --- [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "心魔试炼" }, +-- [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "四海历练" }, -- [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "大闹天宫" }, } local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua index 3c2025eaf1..655396dee1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua @@ -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