From 6f17dbd8741b9c234a9d61cd00e7d956a92b4693 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 27 Apr 2021 16:46:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90=E6=81=AD=E5=96=9C=E8=8E=B7?= =?UTF-8?q?=E5=BE=97=E3=80=91=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/RewardItemPopup.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 641461408f..41628e34ed 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -273,10 +273,14 @@ function RewardItemPopup:OnSortingOrderChange() if not itemDataList then return end - for i = 1, #itemListPrefab do - local view = itemListPrefab[i] - local curItemData=itemDataList[i] - view:OnOpen(true,curItemData,1.15,true,true,false,self.sortingOrder) + if #itemListPrefab > 0 then + for i = 1, #itemListPrefab do + if itemListPrefab[i] then + local view = itemListPrefab[i] + local curItemData=itemDataList[i] + view:OnOpen(true,curItemData,1.15,true,true,false,self.sortingOrder) + end + end end end -- 根据物品列表数据显示物品 From 5937fc3493e60e7a857a0940d4a7fe9d04eea98b Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 27 Apr 2021 16:51:58 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=A4=BC=E5=8C=85=E9=A2=84=E8=AE=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab index a6ffda6f15..c1611ea1f3 100644 --- a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab @@ -24319,7 +24319,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7076300033625331926 RectTransform: m_ObjectHideFlags: 0 @@ -43880,7 +43880,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: -52.62 + m_Spacing: -110 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 From 39f2f06563eb9302e3ce65784a956873d0588585 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 27 Apr 2021 17:05:53 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E9=99=90=E6=97=B6=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E3=80=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/NewActivity/ExpertPage.prefab | 2 +- .../Modules/NewActivity/CommonActPage.lua | 2 +- .../NewActivity/CommonActPageManager.lua | 6 ++++++ .../Modules/NewActivity/ConRechargePage.lua | 2 +- .../~Lua/Modules/NewActivity/ExpertPage.lua | 10 ++++++--- .../~Lua/Modules/NewActivity/ExpertPre.lua | 21 +++++++++++++++---- .../Modules/NewActivity/ItemUpstarPre.lua | 7 ++++--- 7 files changed, 37 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab index d6bcc2d474..87133f24ba 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab @@ -38851,7 +38851,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: LanguageIndex: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index dfd54e91f3..f0c4bb2fd5 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -116,7 +116,7 @@ function CommonActPage:ShowSingleData(item,sdata,index) return end item.gameObject:SetActive(true) - self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData.activityId) + self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData,self.actConfig) end function CommonActPage:RefreshTime() diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 9fd73cc795..c058a89b8c 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -133,6 +133,9 @@ function this.GetExpertData(indexType,actType) curData.rewards[i].otherData.state = 0 end curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].progress,curData.rewards[i].otherData.Values) + if curData.rewards[i].progress > curData.rewards[i].otherData.Values then + curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].otherData.Values,curData.rewards[i].otherData.Values) + end elseif indexType == 2 then -- LogPink("curData.value:"..tostring(curData.value).." "..tostring(curData.rewards[i].otherData.Values)) if curData.value < curData.rewards[i].otherData.Values then @@ -141,6 +144,9 @@ function this.GetExpertData(indexType,actType) curData.rewards[i].otherData.state = 0 end curData.rewards[i].otherData.info = string.format("%s/%s",curData.value,curData.rewards[i].otherData.Values) + if curData.value > curData.rewards[i].otherData.Values then + curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].otherData.Values,curData.rewards[i].otherData.Values) + end end end end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua index be783674ca..27f8fc2fe4 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua @@ -131,7 +131,7 @@ function ConRechargePage:ShowSingleData(item,sdata,index) return end item.gameObject:SetActive(true) - self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData.activityId) + self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData,self.actConfig) end function ConRechargePage:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua index d9eaebfd08..739aebb7f8 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua @@ -108,8 +108,12 @@ function ExpertPage:OnShow(_sortingOrder) --拿取数据 self:RefreshData(true,true) self:RefreshBtns()--刷新上方两个按钮 - Util.AddParticleSortLayer( self.effect, _sortingOrder - self.sortingOrder) - self.sortingOrder = _sortingOrder + self.effect:SetActive(false) + if self.actConfig.ActiveType == ActivityTypeDef.AccumulativeRechargeExper then + self.effect:SetActive(true) + Util.AddParticleSortLayer( self.effect, _sortingOrder - self.sortingOrder) + self.sortingOrder = _sortingOrder + end end function ExpertPage:RefreshBtns() @@ -160,7 +164,7 @@ function ExpertPage:ShowSingleData(item,sdata,index) return end item.gameObject:SetActive(true) - self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData.activityId,self.ActData.value,self.actConfig) + self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData,self.actConfig) end function ExpertPage:RefreshTime() diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua index 8fccdd7e81..b6fbefc5ff 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua @@ -11,7 +11,7 @@ end local BtnState = { [0] = {Img = "s_slbz_1anniuongse", isRed = true, isGray = false, Text = Language[11948],}, [1] = {Img = "s_slbz_1anniuhuangse", isRed = false, isGray = false, Text = Language[10556]}, - [2] = {Img = "s_slbz_1anniuongse", isRed = false, isGray = true, Text = Language[11948]}, + [2] = {Img = "s_slbz_1anniuongse", isRed = false, isGray = true, Text = Language[10101]}, } --初始化组件(用于子类重写) @@ -39,11 +39,12 @@ end function ExpertPre:OnOpen() end -function ExpertPre:SetData(_data,_parent,_sortingOrder,_activityId) +function ExpertPre:SetData(_data,_parent,_sortingOrder,_actData,_actConfig) self.data = _data self.parent = _parent self.sortingOrder = _sortingOrder - self.activityId = _activityId + self.actData = _actData + self.actConfig = _actConfig self:Refresh() end @@ -71,10 +72,15 @@ function ExpertPre:SetButton() self.redPoint:SetActive(btnData.isRed) self.btnText.text = btnData.Text self.info.text = self.data.otherData.info + if self.actConfig.ActiveType == ActivityTypeDef.ContinuityRecharge then + local bool = self:IsCurrentSortEnable(self.data.otherData.Sort) + self.btnGet:GetComponent("Button").interactable = bool + Util.SetGray(self.btnGet, not bool) + end Util.AddOnceClick(self.btnGet, function() if self.data.otherData.state == 0 then - NetManager.GetActivityRewardRequest(self.data.missionId, self.activityId, function(drop) + NetManager.GetActivityRewardRequest(self.data.missionId, self.actData.activityId, function(drop) UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function() self.parent:RefreshData(true,false) CheckRedPointStatus(RedPointType.Expert_FastExplore) @@ -95,4 +101,11 @@ function ExpertPre:OnClose() end end +--积天豪礼是否轮到当天可充了 +function ExpertPre:IsCurrentSortEnable(sort) + local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.ContinuityRecharge) + return activityInfo.value + 1 == sort +end + + return ExpertPre \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua index e689363de7..8850dc743c 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua @@ -39,7 +39,7 @@ function ItemUpstarPre:BindEvent() return end local cost = ConfigManager.GetConfigData(ConfigName.ComposeBook,self.data.otherData.selectId).NeedCost - NetManager.EquipUpLevelRequest(self.activityId,self.data.otherData.selectId,cost[1][1],cost[1][2],function (msg) + NetManager.EquipUpLevelRequest(self.actData.activityId,self.data.otherData.selectId,cost[1][1],cost[1][2],function (msg) UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function() self.parent:RefreshData(true,true,false) end) @@ -58,11 +58,12 @@ end function ItemUpstarPre:OnOpen() end -function ItemUpstarPre:SetData(_data,_parent,_sortingOrder,_activityId) +function ItemUpstarPre:SetData(_data,_parent,_sortingOrder,_actData,_actConfig) self.data = _data self.parent = _parent self.sortingOrder = _sortingOrder - self.activityId = _activityId + self.actData = _actData + self.actConfig = _actConfig self:Refresh() end From 90fd541e99e7af0c9c301e3fb8e4a3d0343f2e73 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 27 Apr 2021 17:50:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=90=E9=99=90=E6=97=B6=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E3=80=91=E5=88=A0=E9=99=A4timer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/NewActivity/CommonActPage.lua | 4 ++++ .../~Lua/Modules/NewActivity/ExChangePage.lua | 2 +- .../ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua | 4 ++++ .../ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index f0c4bb2fd5..fa0113e011 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -146,6 +146,10 @@ function CommonActPage:OnClose() end function CommonActPage:OnDestroy() + if self.localTimer then + self.localTimer:Stop() + self.localTimer = nil + end for k,v in pairs(self.ItemList) do SubUIManager.Close(v) end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua index a48e010d31..9b3397c0b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExChangePage.lua @@ -74,7 +74,7 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function ExChangePage:OnShow(_sortingOrder) self.gameObject:SetActive(true) - self.cursortingOrder = _sortingOrder or self.self.cursortingOrder + self.cursortingOrder = _sortingOrder or self.cursortingOrder self:ExChangeShow() end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua index 739aebb7f8..b0d09d0711 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua @@ -199,6 +199,10 @@ function ExpertPage:OnClose() end function ExpertPage:OnDestroy() + if self.localTimer then + self.localTimer:Stop() + self.localTimer = nil + end for k,v in pairs(self.ItemList) do SubUIManager.Close(v) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 41628e34ed..98b0017a2c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -270,12 +270,12 @@ function RewardItemPopup:SelectCanPopUpBagMaxMessage() end function RewardItemPopup:OnSortingOrderChange() - if not itemDataList then + if not itemDataList or #itemDataList < 0 then return end if #itemListPrefab > 0 then for i = 1, #itemListPrefab do - if itemListPrefab[i] then + if itemListPrefab[i] and itemDataList[i] then local view = itemListPrefab[i] local curItemData=itemDataList[i] view:OnOpen(true,curItemData,1.15,true,true,false,self.sortingOrder) From 4cbb65c73baaeddb0450e1f5c2aef5eee0333293 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 27 Apr 2021 17:53:15 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90=E8=B6=85=E5=80=BC=E5=9F=BA?= =?UTF-8?q?=E9=87=91=E3=80=91=E4=B9=B0=E4=B8=A4=E6=AC=A1=20=E5=B0=9D?= =?UTF-8?q?=E8=AF=95=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/UppperMonthCard.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 1125c1d405..39d6515c70 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -72,11 +72,11 @@ end --绑定事件(用于子类重写) function UpperMonthCard:BindEvent() - Util.AddClick(self.btnPreview, function() + Util.AddOnceClick(self.btnPreview, function() UIManager.OpenPanel(UIName.MonthRewardPreviewPopup, self.baseType, self.chargerBaseType) end) - Util.AddClick(self.btnBuy, function() + Util.AddOnceClick(self.btnBuy, function() local isActive = VipManager.GetMonthCardOpenState() if not isActive then MsgPanel.ShowTwo(Language[11387], function() From f20c58dc9607139552c8f89cc206bf9ad353e545 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 27 Apr 2021 17:56:55 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E6=8F=B4?= =?UTF-8?q?=E5=8A=A9=E3=80=91=20=E6=AF=8F=E6=AC=A1=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8F=B4=E5=8A=A9=EF=BC=8C=E5=88=97=E8=A1=A8=E9=83=BD=E4=BC=9A?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BD=AE=E9=A1=B6=E6=98=BE=E7=A4=BA----3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Recharge/View/EveryDayGift.lua | 9 +++++++-- Assets/ManagedResources/~Lua/View/ScrollCycleView.lua | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 4594376216..ec36512dd1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -121,6 +121,7 @@ function EveryDayGift:OnShow(_sortingOrder) self.titleTip.gameObject:SetActive(true) else self.titleTip.gameObject:SetActive(false) + end if self.actConfig.Id == 63 then @@ -163,6 +164,7 @@ function EveryDayGift:RefreshGiftData(isTop,isAni) if self.shopData[i].DataType == DynamicActivityManager.selectIndex.dataType then for j = 1 , #DynamicActivityManager.selectIndex.goodsId do if (self.shopData[i].data.shopData.id or self.shopData[i].data.shopData.goodsId) == DynamicActivityManager.selectIndex.goodsId[j] then + DynamicActivityManager.SetSelectIndex(0,{}) curindex = i break end @@ -172,8 +174,11 @@ function EveryDayGift:RefreshGiftData(isTop,isAni) break end end - --LogGreen("curindex:"..curindex) - self.scrollView:SetIndex(curindex) + if curindex ~= 0 then + --LogGreen("curindex:"..curindex) + self.scrollView:SetIndex(curindex) + end + end function EveryDayGift:isBought() diff --git a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua index 1928336a91..b1bb92ae1e 100644 --- a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua +++ b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua @@ -322,9 +322,10 @@ function this:SetData(dataList, updateFunc, noTop, noAnim) -- 判断是否回到顶部,否则保持不动 if noTop then local oldPosY = self.dragGOTran.anchoredPosition.y + local oldPosX = self.dragGOTran.anchoredPosition.x local showIndex = self:CalShowIndex() self:SetShow(showIndex) - self.dragGOTran.anchoredPosition = Vector2.New(0, oldPosY) + self.dragGOTran.anchoredPosition = Vector2.New(oldPosX, oldPosY) else self:SetShow(1) end