diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua index daeaad0741..9f841fee81 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua @@ -180,6 +180,7 @@ function MissionPre:SetIcon1(_itemdata) self.btnGet:GetComponent("Image").sprite = Util.LoadSprite(type[_itemdata.state].sprite) self.redPoint.gameObject:SetActive(false) self.redPoint.gameObject:SetActive(_itemdata.state == 1) + Util.SetGray(self.redPoint,false) self.btnGet:GetComponent("Button").enabled = _itemdata.state ~= 2 self.btnGetText.text = type[_itemdata.state].text if _itemdata.state ~= 0 then @@ -250,6 +251,7 @@ function MissionPre:SetIcon(_itemdata) self.btnGetText.text = Language[10018] elseif self.data.state == 2 then self.redPoint.gameObject:SetActive(true) + Util.SetGray(self.redPoint,false) self.btnGetText.text = Language[10018] elseif self.data.state == 1 then self.redPoint.gameObject:SetActive(false) @@ -258,6 +260,7 @@ function MissionPre:SetIcon(_itemdata) Util.SetGray(self.btnGet,true) elseif self.data.state == 0 then self.redPoint.gameObject:SetActive(true) + Util.SetGray(self.redPoint,false) self.btnGetText.text = Language[10018] end end diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 1dc4bfaae8..bffc4fd1b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -242,6 +242,12 @@ function EveryDayGift:GetRemainTime() self.endTimeBg.gameObject:SetActive(false) return end + local la = "" + if self.actConfig.ShowTime ~= 1 then + la = Language[10023] + else + la = Language[11355] + end self.endTimeBg.gameObject:SetActive(true) local freshTime = 0 if self.shopData and #self.shopData > 0 then @@ -256,9 +262,9 @@ function EveryDayGift:GetRemainTime() -- 剩余小时 local formatTime, leftHour = TimeToHMS(showfreshTime) if leftHour > 24 then - self.endTime.text = Language[11355]..TimeToDHMS(showfreshTime)--天时分秒 + self.endTime.text = la..TimeToDHMS(showfreshTime)--天时分秒 else - self.endTime.text = Language[11355]..formatTime--时分秒 + self.endTime.text = la..formatTime--时分秒 end elseif showfreshTime < 0 then if self.localTimer then