From 1bdecf243251d61981e91a53cf4eeaa09ec9ad53 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 24 Jul 2024 19:20:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E5=A4=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContinuePackagePanel.prefab | 145 +++++++++++++++--- .../ContinuePackage/ContinuePackagePanel.lua | 4 +- 2 files changed, 128 insertions(+), 21 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab index 330caa8982..7404567d13 100644 --- a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab @@ -279,12 +279,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4957794194947264391} - m_RootOrder: 3 + 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: -106.2, y: 0} - m_SizeDelta: {x: 515.2, y: 150} + m_AnchoredPosition: {x: -135.77, y: 0} + m_SizeDelta: {x: 456.05, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7213273430475869332 MonoBehaviour: @@ -358,6 +358,7 @@ GameObject: - component: {fileID: 5731456838267947944} - component: {fileID: 6101947240466384844} - component: {fileID: 1510368406022213037} + - component: {fileID: 7076943172965045833} m_Layer: 0 m_Name: times m_TagString: Untagged @@ -377,11 +378,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4957794194947264391} - m_RootOrder: 2 + m_RootOrder: 3 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: 260, y: -59.303} + m_AnchoredPosition: {x: 260, y: -62.7} m_SizeDelta: {x: 200, y: 45.605} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6101947240466384844 @@ -427,6 +428,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5269\u4F59\uFF1A3\u6B21" LanguageIndex: 0 +--- !u!114 &7076943172965045833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1558093585672720735} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &2230658934678160912 GameObject: m_ObjectHideFlags: 0 @@ -517,6 +533,7 @@ GameObject: - component: {fileID: 3383171814414968218} - component: {fileID: 6298772290171829105} - component: {fileID: 4108224001695914233} + - component: {fileID: 6279586186914035297} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -586,6 +603,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "3\u65E5\u540E\u53EF\u8D2D" LanguageIndex: 0 +--- !u!114 &6279586186914035297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3133122158697389110} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &3256576954911748796 GameObject: m_ObjectHideFlags: 0 @@ -877,7 +909,7 @@ 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: 428.5, y: 391.5} + m_AnchoredPosition: {x: 428.5, y: 416} m_SizeDelta: {x: 93, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &677359223100805530 @@ -1149,11 +1181,11 @@ RectTransform: m_Children: - {fileID: 3383171814414968218} m_Father: {fileID: 4957794194947264391} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 265.09995, y: -39} + m_AnchoredPosition: {x: 265.09995, y: -33.6} m_SizeDelta: {x: 200, y: 42.68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2568250143643158960 @@ -1296,6 +1328,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6615026783696917505} - {fileID: 1421605945814085954} - {fileID: 311860523735992108} - {fileID: 5731456838267947944} @@ -1329,15 +1362,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.3137255} 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_Sprite: {fileID: 21300000, guid: 1c95bc8f1592c2e40b82abc22f9f1d78, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 93cdbf91298a588478393900a05b8647, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1420,6 +1453,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5708297853861114811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6615026783696917505} + - component: {fileID: 2675532710048596006} + - component: {fileID: 5638576234685168099} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6615026783696917505 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5708297853861114811} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4957794194947264391} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -168.35, y: 3.4300003} + m_SizeDelta: {x: 321.59, y: -15.43} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2675532710048596006 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5708297853861114811} + m_CullTransparentMesh: 0 +--- !u!114 &5638576234685168099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5708297853861114811} + 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: 0.35635456, g: 0.5227552, b: 0.5283019, a: 0.76862746} + 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_Sprite: {fileID: 21300000, guid: e1ae3e051c86b38489be1306dac9bb32, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6071693783530045743 GameObject: m_ObjectHideFlags: 0 @@ -1729,12 +1836,12 @@ RectTransform: - {fileID: 8788889948934153483} - {fileID: 4153848244485354422} m_Father: {fileID: 4957794194947264391} - m_RootOrder: 1 + 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: 265, y: -1.5} - m_SizeDelta: {x: 190, y: 70} + m_AnchoredPosition: {x: 256.39, y: 1.58} + m_SizeDelta: {x: 207.21, y: 76.16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8407601103703489248 CanvasRenderer: @@ -1764,7 +1871,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: e0d70e0322fd03b4bbf550d673a7cc5d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1893,7 +2000,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3254902, g: 0.11764707, b: 0.039215688, a: 1} + m_Color: {r: 0.11320752, g: 0.046135943, b: 0.020825913, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2372,7 +2479,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -5.8, y: 4.9} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5217898209374821244 @@ -2396,7 +2503,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3254902, g: 0.11764707, b: 0.039215688, a: 1} + m_Color: {r: 0.09433961, g: 0.084970266, b: 0.08143466, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2551,7 +2658,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: -6.8, y: 4.9} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3805795079689441902 diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua index 7e849c0329..d1d2ba9f2c 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua @@ -155,12 +155,12 @@ function ContinuePackagePanel:ShowSingleHero(go,data,index) obj:SetActive(false) canBuyTime.text = string.format( "剩余:%s次",data.progress) canBuyTime.gameObject:SetActive(self.curPage ~= btnType.LianGou)--第一页连购好礼不显示剩余次数 - btnImg.sprite = self.spLoader:LoadSprite("Btn_hz_cheng_01") + btnImg.sprite = self.spLoader:LoadSprite("X1_zhanling_pata_bt_03") if data.otherData.GoodType == 1 then--直购 btnText.gameObject:SetActive(true) btnText.text = string.format("%s 元",data.otherData.Price) if data.state == 8 then - btnImg.sprite = self.spLoader:LoadSprite("Btn_hz_lan_01") + btnImg.sprite = self.spLoader:LoadSprite("X1_zhanling_pata_bt_04") btnText.text = Language[10514] canBuyTime.text = "" elseif data.state == 3 then