From 86d0aadc5d8e94c73e349e96b5bb3631016abd84 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 2 Nov 2023 18:49:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=80=BC=E8=BF=9E=E5=86=B2=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContinuePackage/PremiumRebatePanel.prefab | 365 +++++------------- .../ContinuePackage/PremiumRebatePanel.lua | 4 + 2 files changed, 105 insertions(+), 264 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab index bbe2e6294f..57d15ada9f 100644 --- a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab @@ -269,8 +269,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 327719872794192258} - - component: {fileID: 6888631392110526536} - - component: {fileID: 4855938979208445017} + - component: {fileID: 1590672532} m_Layer: 0 m_Name: box m_TagString: Untagged @@ -290,14 +289,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5560347858770598648} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -81.4} - m_SizeDelta: {x: 82, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -182.94992, y: 416.65} + m_SizeDelta: {x: 348.15, y: 833.3} m_Pivot: {x: 0, y: 1} ---- !u!114 &6888631392110526536 +--- !u!114 &1590672532 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -306,21 +305,7 @@ MonoBehaviour: m_GameObject: {fileID: 668515550640612316} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &4855938979208445017 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 668515550640612316} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: @@ -329,11 +314,12 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: -8 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_StartCorner: 2 + m_StartAxis: 1 + m_CellSize: {x: 237, y: 197} + m_Spacing: {x: 0, y: -100} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &902109664729184121 GameObject: m_ObjectHideFlags: 0 @@ -368,7 +354,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -5.6, y: -6.6} + m_AnchoredPosition: {x: -5.5999985, y: -6.5999985} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7578140580301704726 @@ -790,17 +776,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7121277092858204037} - - {fileID: 3425824529020890089} - {fileID: 2545290923758964436} - {fileID: 327719872794192258} m_Father: {fileID: 2750471745573935426} m_RootOrder: 6 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: -399.258, y: -52} - m_SizeDelta: {x: 81.8, y: 833.3} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 180, y: -848} + m_SizeDelta: {x: 330.4, y: 833.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2407937911512814976 MonoBehaviour: @@ -849,85 +833,11 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1782166199271356142} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2937959955895347159 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6883153514917663980} - - component: {fileID: 4233011639035538807} - - component: {fileID: 8342674694801574286} - m_Layer: 0 - m_Name: bgline - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6883153514917663980 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2937959955895347159} - 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: 2545290923758964436} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40.04, y: -8.7} - m_SizeDelta: {x: 4, y: 22} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4233011639035538807 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2937959955895347159} - m_CullTransparentMesh: 0 ---- !u!114 &8342674694801574286 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2937959955895347159} - 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: 86256680c3fd67748a7741b91703cb6b, 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 &3256576954911748796 GameObject: m_ObjectHideFlags: 0 @@ -1114,7 +1024,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 100 m_TargetDisplay: 0 --- !u!114 &2373637757759864707 MonoBehaviour: @@ -1181,7 +1091,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2545290923758964436 RectTransform: m_ObjectHideFlags: 0 @@ -1193,19 +1103,18 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6883153514917663980} - {fileID: 1052084151771884818} - {fileID: 7944016472393893859} - {fileID: 3435773343199518887} - {fileID: 1937467392759674615} - {fileID: 7438501248280487076} m_Father: {fileID: 5560347858770598648} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -286.8, y: -190} - m_SizeDelta: {x: 82, y: 213.29} + m_AnchoredPosition: {x: 267.86, y: -174.5} + m_SizeDelta: {x: 235.6, y: 192.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3023659987410006798 CanvasRenderer: @@ -1321,17 +1230,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3609916302687914418} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.11883721, w: 0.9929138} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2545290923758964436} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 13.65} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.03, y: -3.13} - m_SizeDelta: {x: 60.06, y: 159.2} + m_AnchoredPosition: {x: 1.2, y: -36.7} + m_SizeDelta: {x: 214.7, y: 47.38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8430205233688018 CanvasRenderer: @@ -1362,7 +1271,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 @@ -1373,7 +1282,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1.2 + m_LineSpacing: 1 m_Text: "30\u5143" --- !u!1 &3694849207738348854 GameObject: @@ -1405,11 +1314,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2545290923758964436} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -15, y: -28.642} + m_AnchoredPosition: {x: -33.1, y: -84.2} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1979780772852713283 @@ -1479,12 +1388,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2545290923758964436} - m_RootOrder: 1 + 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: -0.96, y: -6.8225} - m_SizeDelta: {x: 83.92, y: 199.65} + m_SizeDelta: {x: 234, y: 197} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2352292072782719741 CanvasRenderer: @@ -1514,7 +1423,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: 2aaa6456430fe044b9979521c30bb14f, type: 3} + m_Sprite: {fileID: 21300000, guid: 5c7bdd59318dd4741a7cd61e6accc84e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1620,7 +1529,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3435773343199518887 RectTransform: m_ObjectHideFlags: 0 @@ -1633,7 +1542,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2545290923758964436} - m_RootOrder: 3 + 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} @@ -1677,7 +1586,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4592626312206583315 +--- !u!1 &4691042502711393305 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1685,51 +1594,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3425824529020890089} - - component: {fileID: 9095002885393083940} - - component: {fileID: 3402853726618675202} - - component: {fileID: 3191184971601667761} + - component: {fileID: 412857220546495679} + - component: {fileID: 7729555474383811397} + - component: {fileID: 1270148240989815663} + - component: {fileID: 3526181908540081664} m_Layer: 0 - m_Name: Image (1) + m_Name: btn_close m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3425824529020890089 +--- !u!224 &412857220546495679 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4592626312206583315} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 4691042502711393305} + 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: 5560347858770598648} - m_RootOrder: 1 + m_Father: {fileID: 2750471745573935426} + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 41, y: -511.5} - m_SizeDelta: {x: 22, y: 38} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 437, y: 343} + m_SizeDelta: {x: 93, y: 94} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9095002885393083940 +--- !u!222 &7729555474383811397 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4592626312206583315} + m_GameObject: {fileID: 4691042502711393305} m_CullTransparentMesh: 0 ---- !u!114 &3402853726618675202 +--- !u!114 &1270148240989815663 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4592626312206583315} + m_GameObject: {fileID: 4691042502711393305} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1737,13 +1646,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + 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: e2731e40030fada4c8f0f329d0ac9d63, type: 3} + m_Sprite: {fileID: 21300000, guid: 6215d0a957d4eb845b9f5ce0ef2c64f3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1752,26 +1661,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &3191184971601667761 +--- !u!114 &3526181908540081664 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4592626312206583315} + m_GameObject: {fileID: 4691042502711393305} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1270148240989815663} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &4729234240114352799 GameObject: m_ObjectHideFlags: 0 @@ -2005,101 +1936,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7D2F\u8BA1\u5145\u503C" LanguageIndex: 0 ---- !u!1 &6121961578120532490 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7121277092858204037} - - component: {fileID: 5972195482843868914} - - component: {fileID: 3524199934524539924} - - component: {fileID: 4644362798616874969} - m_Layer: 0 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7121277092858204037 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6121961578120532490} - 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: 5560347858770598648} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40.9, y: -50} - m_SizeDelta: {x: 8, y: 102} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5972195482843868914 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6121961578120532490} - m_CullTransparentMesh: 0 ---- !u!114 &3524199934524539924 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6121961578120532490} - 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: 2a2795332afeccd44a0aa63396fe75b3, 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!114 &4644362798616874969 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6121961578120532490} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &6448553166763535520 GameObject: m_ObjectHideFlags: 0 @@ -2130,12 +1966,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2545290923758964436} - m_RootOrder: 2 + m_RootOrder: 1 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.96, y: -8.63} - m_SizeDelta: {x: 88.71, y: 203.25} + m_SizeDelta: {x: 234, y: 197} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4741744585942726438 CanvasRenderer: @@ -2165,7 +2001,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: 9c58f94f924c5594fbff6700d623c4fb, type: 3} + m_Sprite: {fileID: 21300000, guid: 7a72a320a6797f74d99e76773e3f9890, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2210,13 +2046,14 @@ RectTransform: - {fileID: 6793231540162019059} - {fileID: 5560347858770598648} - {fileID: 1645606937427718578} + - {fileID: 412857220546495679} m_Father: {fileID: 898193909354494019} 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: -24.722, y: 0} - m_SizeDelta: {x: 1030.6, y: 1920} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2408724274248282544 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua index 62a994d192..a60b2e1cdd 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua @@ -17,6 +17,7 @@ local gridPar function PremiumRebatePanel:InitComponent() this.spLoader = SpriteLoader.New() this.backBtn = Util.GetGameObject(self.gameObject, "closeBtn") + this.btn_close = Util.GetGameObject(self.gameObject, "Bg/btn_close") this.itemPre = Util.GetGameObject(self.gameObject, "Bg/ItemPre") this.scrollItem = Util.GetGameObject(self.gameObject, "Bg/scroll") this.leftTime = Util.GetGameObject(self.gameObject, "Bg/time/leftTime"):GetComponent("Text") @@ -39,6 +40,9 @@ end function PremiumRebatePanel:BindEvent() Util.AddOnceClick(this.backBtn, function() this:ClosePanel() + end) + Util.AddOnceClick(this.btn_close, function() + this:ClosePanel() end) -- 初始化Tab管理器 this.PageTabCtrl = TabBox.New()