From 37c7c839c4d7ef686a6a72b296c4f7737f9160ad Mon Sep 17 00:00:00 2001 From: jiaoyangna <17610272109@lianjingshidai.com> Date: Thu, 9 Jul 2020 10:04:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E6=97=B6=E5=8F=AC=E5=94=A4=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Operating/OperatingPanel.prefab | 2 +- .../~Lua/Modules/Operating/OperatingManager.lua | 1 + .../ManagedResources/~Lua/Modules/Operating/RewardPreview.lua | 2 +- .../~Lua/Modules/Operating/TimeLimitedCall.lua | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab index d481273265..41bc0419b4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab @@ -2144,7 +2144,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &771717322046565802 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index febe5cc75b..52d8a6b672 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -701,4 +701,5 @@ function this.GetTimeLimitRedPointStatus() return freeTime and freeTime >= 1 end end +this.TimeLimitedTimes = 0 return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua b/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua index d84fc6f377..1ed5f06850 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/RewardPreview.lua @@ -32,7 +32,7 @@ end function RewardPreview:OnShow() self.gameObject:SetActive(true) local maxtimesId = lotterySetting[RecruitType.TimeLimitSingle].MaxTimes - curtimes = PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId) + curtimes = OperatingManager.TimeLimitedTimes self:RefreshRewarid() self.curtimes.text = Language[12181] .. curtimes self.slider.fillAmount = self:CalculateInterval(curtimes) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua index b1d1a29c19..2504d48353 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua @@ -156,6 +156,7 @@ function TimeLimitedCall:RefreshNextLevelReward() rewarditem = data1[#data1] curLv=data1[#data1].Id end + OperatingManager.TimeLimitedTimes = curTimes local o= SubUIManager.Open(SubUIConfig.ItemView,self.nextReward.transform) o:OnOpen(false, {rewarditem.Reward[1][1],rewarditem.Reward[1][2]}, 0.73, false) o.gameObject:SetActive(true) @@ -226,7 +227,7 @@ end function TimeLimitedCall:GetMissionStateById(num,activityId) --LogBlue("activityId:"..activityId.. ",num:"..num) local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据 - --LogBlue(mission.progress.." "..mission.state) + LogBlue(mission.progress.." "..mission.state) return mission.progress,mission.state end