diff --git a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab index b91dda2123..374282abf4 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/WeekCardPanel.prefab @@ -925,7 +925,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.000030517578} + m_AnchoredPosition: {x: 0, y: -0.000015258789} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3791396216814909723 @@ -7730,6 +7730,7 @@ RectTransform: - {fileID: 3791396218843401763} - {fileID: 3791396217311411439} - {fileID: 5135232078593581264} + - {fileID: 7117430315029715279} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13094,6 +13095,85 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5171\u8BA1\uFF1A500\u4E07\u91D1\u5E01" +--- !u!1 &5215131370766415250 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7117430315029715279} + - component: {fileID: 6839541896985148148} + - component: {fileID: 9200652974613220537} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7117430315029715279 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5215131370766415250} + 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: 7543121757773600665} + m_RootOrder: 16 + 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: -646} + m_SizeDelta: {x: 1080, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6839541896985148148 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5215131370766415250} + m_CullTransparentMesh: 0 +--- !u!114 &9200652974613220537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5215131370766415250} + 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: 1, g: 1, b: 1, 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: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8D2D\u4E70\u5468\u5361\u4E0D\u53EF\u4F7F\u7528\u4EE3\u91D1\u5238" --- !u!1 &6227997053656680672 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPanel.lua index 515e5bcbeb..794e80fd76 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/WeekCardPanel.lua @@ -356,7 +356,7 @@ function WeekCardPanel:ShowCardInfo(index, config) local id = rechargeCfg.RewardShow[1][1] local num = rechargeCfg.RewardShow[1][2] local _name = _ItemConfig[id].Name - pre.lideTxt.text = "激活立得" .. _name .. "*" .. PrintWanNum2(num) .. + pre.lideTxt.text = "激活立得" .. _name .. "*" .. PrintWanNum2(num) .. "" pre.btnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(rechargeCfg.Price) pre.red:SetActive(false)