From 43ee7dd5778ef87541fee69320f6bdba797c1c58 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 28 Jul 2020 20:09:41 +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 --- .../~Lua/Modules/Carbon/DailyCarbonPanel.lua | 4 +-- .../Modules/Operating/TimeLimitedCall.lua | 25 +++++++++++++------ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index 7134455038..25370d74a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -14,11 +14,11 @@ local carbonIndex=0--副本索引 --顶部背景图 local titleBg={ - [1]={bg="r_richang_banner_5",titleTip = specialConfig[45].Value,pos = Vector3.New(257.08,651.24,0)}, + [1]={bg="r_richang_banner_5",titleTip = specialConfig[45].Value,pos = Vector3.New(257.08,658.37,0)}, [2]={bg="r_richang_banner_4",titleTip = specialConfig[44].Value,pos = Vector3.New(257.08,651.24,0)}, [3]={bg="r_richang_banner_3",titleTip = specialConfig[43].Value,pos = Vector3.New(257.08,658.37,0)}, [4]={bg="r_richang_banner_2",titleTip = specialConfig[42].Value,pos = Vector3.New(257.08,651.24,0)}, - [5]={bg="r_richang_banner_1",titleTip = specialConfig[41].Value,pos = Vector3.New(257.08,658.37,0)}, + [5]={bg="r_richang_banner_1",titleTip = specialConfig[41].Value,pos = Vector3.New(257.08,651.24,0)}, } --难度图片 local qualityBg={ diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua index d6de60b198..a497d2b6c5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua @@ -22,7 +22,7 @@ local secectTab=-1 local hero={[1]={name="Bg/hero1",id=10001,hero="x_xianshizaohuan_fx"},[2]={name="Bg/hero3",id=10041,hero="x_xianshizaohuan_ttjz"},[3]={name="Bg/hero2",id=10089,hero="x_xianshizaohuan_rd"}} local curLv=0 --当前阶段id - +local itemView function TimeLimitedCall:ctor(mainPanel, gameObject) self.mainPanel = mainPanel @@ -157,12 +157,17 @@ function TimeLimitedCall:RefreshNextLevelReward() 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) - Util.GetGameObject(o.gameObject,"item/frame"):GetComponent("Button").enabled=false + if not itemView then + itemView= SubUIManager.Open(SubUIConfig.ItemView,self.nextReward.transform) + end + itemView:OnOpen(false, {rewarditem.Reward[1][1],rewarditem.Reward[1][2]}, 0.73, false) + itemView.gameObject:SetActive(true) + Util.GetGameObject(itemView.gameObject,"item/frame"):GetComponent("Button").enabled=false if (curLvstate==0) then - self.slider.gameObject:SetActive(false) + -- self.slider.gameObject:SetActive(false)\ + local temp = curTimes <= rewarditem.Values[1][1] and curTimes or rewarditem.Values[1][1] + Util.GetGameObject(self.slider.gameObject,"Text"):GetComponent("Text").text=temp.."/"..rewarditem.Values[1][1] + self.slider.value=temp /rewarditem.Values[1][1] local vec=self.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D vec.y=22.4 self.sliderText.transform:GetComponent("RectTransform").anchoredPosition3D=vec @@ -178,8 +183,11 @@ function TimeLimitedCall:RefreshNextLevelReward() end) self.effect.gameObject:SetActive(true) elseif (curLvstate==-1) then - self.slider.gameObject:SetActive(false) - self.sliderText.gameObject:SetActive(false) + -- self.slider.gameObject:SetActive(false) + -- self.sliderText.gameObject:SetActive(false) + self.slider.value=1 + Util.GetGameObject(self.slider.gameObject,"Text"):GetComponent("Text").text="300/300" + self.sliderText.text="奖励已全部领取" Util.AddOnceClick(self.getBtn,function() RewardPreview.new(self.reward) end) @@ -352,6 +360,7 @@ end function TimeLimitedCall:OnDestroy() ActivityDetail.OnDestroy() RewardPreview.OnDestroy() + itemView=nil end return TimeLimitedCall \ No newline at end of file