diff --git a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab index 2546b88659..63f3859db0 100644 --- a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab @@ -555,6 +555,85 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5269\u4F59\uFF1A3\u6B21" LanguageIndex: 0 +--- !u!1 &1764046185916918664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3285300986143333570} + - component: {fileID: 8241431626525933070} + - component: {fileID: 3163272608995200095} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3285300986143333570 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1764046185916918664} + 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: [] + m_Father: {fileID: 3451205034012006311} + m_RootOrder: 0 + 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: -8.8, y: -3.2} + m_SizeDelta: {x: 59.33, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8241431626525933070 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1764046185916918664} + m_CullTransparentMesh: 0 +--- !u!114 &3163272608995200095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1764046185916918664} + 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.98039216, g: 0.8235294, b: 0.4117647, 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: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6298\u540E" --- !u!1 &2134849972680617864 GameObject: m_ObjectHideFlags: 0 @@ -1444,6 +1523,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1280, y: 2400} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4135318027080796968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3451205034012006311} + - component: {fileID: 6222784092170102273} + - component: {fileID: 8720734576420440844} + m_Layer: 5 + m_Name: zheImg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3451205034012006311 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4135318027080796968} + 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: 3285300986143333570} + m_Father: {fileID: 311860523735992108} + m_RootOrder: 2 + 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: -68.7, y: 21.1} + m_SizeDelta: {x: 100, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6222784092170102273 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4135318027080796968} + m_CullTransparentMesh: 0 +--- !u!114 &8720734576420440844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4135318027080796968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 258d0de9bff365c4fb4b323882169a9c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4729234240114352799 GameObject: m_ObjectHideFlags: 0 @@ -2695,6 +2849,7 @@ RectTransform: m_Children: - {fileID: 8788889948934153483} - {fileID: 4153848244485354422} + - {fileID: 3451205034012006311} m_Father: {fileID: 4957794194947264391} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2836,7 +2991,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: 0, y: 0} + m_AnchoredPosition: {x: 91, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2545760152514230900 diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua index cad1b1575d..dd2c13b7d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua @@ -133,7 +133,7 @@ function ContinuePackagePanel:ShowSingleHero(go,data,index) local icon = Util.GetGameObject(obj, "icon"):GetComponent("Image") local cost = Util.GetGameObject(obj, "cost"):GetComponent("Text") local canBuyTime = Util.GetGameObject(go, "times"):GetComponent("Text") - + local zheObj=Util.GetGameObject(btnGet, "zheImg") if not self.itemViewList[go] then self.itemViewList[go] = {} end @@ -154,16 +154,19 @@ function ContinuePackagePanel:ShowSingleHero(go,data,index) buyDayImg:SetActive(false) btnText.gameObject:SetActive(false) obj:SetActive(false) + zheObj:SetActive(false) canBuyTime.text = string.format( "剩余:%s次",data.progress) canBuyTime.gameObject:SetActive(self.curPage ~= btnType.LianGou)--第一页连购好礼不显示剩余次数 btnImg.sprite = self.spLoader:LoadSprite("s_slbz_anniu") if data.otherData.GoodType == 1 then--直购 btnText.gameObject:SetActive(true) - btnText.text = string.format("%s 元",data.otherData.Price) + zheObj:SetActive(true) + btnText.text = string.format("%s 元",data.otherData.Price*ZHE_KOU) if data.state == 8 then btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuise") btnText.text = Language[10514] canBuyTime.text = "" + zheObj:SetActive(false) elseif data.state == 3 then Util.SetGray(btnGet,true) elseif data.state == 2 then