diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab index 27615dc92d..10a7526fb6 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab @@ -2888,7 +2888,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: -19, y: 19} + m_AnchoredPosition: {x: -108, y: 19} m_SizeDelta: {x: 400, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7808231887947794752 @@ -2926,13 +2926,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u4F7F\u7528\u76F4\u51B2\u5361\u53EF\u589E\u52A0\u4F59\u989D\uFF0C\u63D0\u5347GM\u7B49\u7EA7\u53EF\u589E\u52A0\u989D\u5EA6\u4E0A\u9650" + m_Text: "\u63D0\u5347GM\u7B49\u7EA7\u53EF\u589E\u52A0\u989D\u5EA6\u4E0A\u9650" LanguageIndex: 0 --- !u!1 &4391975069171442938 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMFreeRecharge.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMFreeRecharge.lua index c87566d571..ad522fac70 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMFreeRecharge.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMFreeRecharge.lua @@ -101,7 +101,7 @@ function GMFreeRecharge:SingleDataShow(item,data) Util.AddOnceClick(btn,function() PayManager.Pay(data.PackID,function() local num=BagManager.GetItemCountById(1367) - self.coinNumTxt.text=num + self.coinNumTxt.text="¥"..num end) end) end @@ -137,11 +137,16 @@ function GMFreeRecharge:OnShow(_sortingOrder) self.gameObject:SetActive(true) sortingOrder = _sortingOrder local num=BagManager.GetItemCountById(1367) - self.coinNumTxt.text=num + self.coinNumTxt.text="¥"..num local useTime=PrivilegeManager.GetPrivilegeUsedTimes(PRIVILEGE_TYPE.GM_YI_YUAN_UP_TIME) local maxNum=ActivityGiftManager.GetYiYuanUpMaxTime() self.progressImg.fillAmount=useTime/maxNum - self.progerssTxt.text=useTime.."/"..maxNum + if maxNum== -1 then + self.progerssTxt.text=useTime.."/".."∞" + else + self.progerssTxt.text=useTime.."/"..maxNum + end + end local gifts={}