diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zh.png index 1a503bf7b6..5877b0c266 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zh.png index 580bb614ee..decb19377c 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zh.png index e19bb70040..508dab6a21 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zh.png index d1ddf09217..b126df33c8 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zh.png index c63f8a3614..1c1cbb3897 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zh.png differ diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua index 022a32bf17..65b77c6b2d 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua @@ -123,7 +123,7 @@ function ShengYiTianJiang:OnShowData() rechargeData = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.DirectPurchaseGift, rechargeConfigId) if rechargeData then - this.buytimes.text = Language[10492]..(rechargeData.dynamicBuyTimes - rechargeData.buyTimes) + this.buytimes.text = Language[10492].. OperatingManager.GetLeftBuyTime(GoodsTypeDef.DirectPurchaseGift, rechargeConfigId)--(rechargeData.dynamicBuyTimes - rechargeData.buyTimes) else --LogGreen("找不到数据了:"..rechargeConfigId) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 98b0017a2c..a88b8f5268 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -3,7 +3,7 @@ RewardItemPopup = Inherit(BasePanel) local this = RewardItemPopup local userLevelData = ConfigManager.GetConfig(ConfigName.PlayerLevelConfig) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) -local itemListPrefab +local itemListPrefab = {} -- local itemListPrefabMax local func local bagType=0 --1 正常背包 2 临时背包 3 公会车迟显示 @@ -99,6 +99,13 @@ end --func 回调 function RewardItemPopup:OnOpen(...) + if #itemListPrefab > 0 then + for i = 1, #itemListPrefab do + destroy(itemListPrefab[i].gameObject) + end + end + itemListPrefab = {} + itemDataList = {} isBackBattle = false isPlayerAniEnd = true isOpenGeiSSRAvtivity = 0 @@ -184,20 +191,28 @@ function RewardItemPopup:OnOpen(...) end function this.InitGrid() - this.dropGrid:SetActive(#itemDataList <= 20 ) - this.dropGridArena:SetActive(#itemDataList > 20 ) - itemListPrefab = {} - if #itemDataList <= 20 then + this.dropGrid:SetActive(#itemDataList <= 25 ) + this.dropGridArena:SetActive(#itemDataList > 25 ) + -- LogYellow("itemListPrefab "..#itemListPrefab) + -- LogYellow("itemDataList "..#itemDataList) + for i = 1, #itemListPrefab do + itemListPrefab[i].gameObject:SetActive(false) + end + if #itemDataList <= 25 then for i = 1, #itemDataList do --初始缓存<= 20 - local view = SubUIManager.Open(SubUIConfig.ItemView, this.dropGrid.transform) - view.gameObject.name = "frame"..i - itemListPrefab[i] = view + if not itemListPrefab[i] then + local view = SubUIManager.Open(SubUIConfig.ItemView, this.dropGrid.transform) + view.gameObject.name = "frame"..i + itemListPrefab[i] = view + end end else for i = 1, #itemDataList do --初始缓存> 20 - local view = SubUIManager.Open(SubUIConfig.ItemView, this.dropGrid2.transform) - view.gameObject.name = "frame"..i - itemListPrefab[i] = view + if not itemListPrefab[i] then + local view = SubUIManager.Open(SubUIConfig.ItemView, this.dropGrid2.transform) + view.gameObject.name = "frame"..i + itemListPrefab[i] = view + end end end end @@ -278,7 +293,8 @@ function RewardItemPopup:OnSortingOrderChange() 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) + -- view:OnOpen(true,curItemData,1.15,true,true,false,self.sortingOrder) + view:SetEffectLayer(self.sortingOrder) end end end @@ -291,70 +307,79 @@ function RewardItemPopup:SetItemShow(drop) itemDataList[i].itemConfig = itemConfig[itemDataList[i].sId] end self:ItemDataListSort(itemDataList) - for i = 1, math.max(#itemDataList, #itemListPrefab) do - local go = itemListPrefab[i] - if not go then - go = SubUIManager.Open(SubUIConfig.ItemView, this.dropGrid.transform) - go.gameObject.name = "frame"..i - itemListPrefab[i] = go - end - go.gameObject:SetActive(false) - end - - callList:Clear() - callList:Push(function () - if isOpenGeiSSRAvtivityTime then - isOpenGeiSSRAvtivityTime:Stop() - isOpenGeiSSRAvtivityTime = nil - end - isOpenGeiSSRAvtivityTime = Timer.New(function () - isPlayerAniEnd = true - if isOpenGeiSSRAvtivity > 0 then - HeroManager.DetectionOpenFiveStarActivity(isOpenGeiSSRAvtivity) - end - end, 0.5):Start() - --在关卡界面获得装备 刷新下btview成员红点 - -- Game.GlobalEvent:DispatchEvent(GameEvent.Equip.EquipChange) - end) - for i = #itemDataList, 1, -1 do - isPlayerAniEnd = false - local view = itemListPrefab[i] - local curItemData=itemDataList[i] - view:OnOpen(true,curItemData,1.15,true,true,false,self.sortingOrder) - --view.gameObject:SetActive(false) + -- for i = 1, math.max(#itemDataList, #itemListPrefab) do + -- local go = itemListPrefab[i] + -- if not go then + -- go = SubUIManager.Open(SubUIConfig.ItemView, this.dropGrid.transform) + -- go.gameObject.name = "frame"..i + -- itemListPrefab[i] = go + -- end + -- go.gameObject:SetActive(false) + -- end + if #itemDataList <= 25 then + callList:Clear() callList:Push(function () - local func = function() - view.gameObject:SetActive(true) - local btn = Util.GetGameObject(view.gameObject, "item/frame"):GetComponent("Button") - btn.enabled = false - PlayUIAnim(view.gameObject, function() - btn.enabled = true - end) - --改为后端更新 - --this.SetItemData2(itemDataList[i]) - Timer.New(function () - isPopGetSSR = false - callList:Pop()() - end, 0.05):Start() - end - if curItemData.configData and curItemData.itemType==3 and curItemData.configData.Quality == 5 then - HeroManager.DetectionOpenFiveStarActivity(curItemData.configData.Star) - end - if curItemData.configData and curItemData.itemType==3 and curItemData.configData.Quality == 5 and showHero then - isPopGetSSR = true - isOpenGeiSSRAvtivity = curItemData.configData.Star - UIManager.OpenPanel(UIName.DropGetSSRHeroShopPanel,curItemData.backData, func) - elseif curItemData.configData and curItemData.itemType==1 and - (curItemData.configData.ItemType == ItemType.Title or curItemData.configData.ItemType == ItemType.Ride) then--皮肤 坐骑 - -- isPopGetSSR = true - -- UIManager.OpenPanel(UIName.DropGetPlayerDecorateShopPanel,curItemData.backData, func) - func() - else - func() + if isOpenGeiSSRAvtivityTime then + isOpenGeiSSRAvtivityTime:Stop() + isOpenGeiSSRAvtivityTime = nil end + isOpenGeiSSRAvtivityTime = Timer.New(function () + isPlayerAniEnd = true + if isOpenGeiSSRAvtivity > 0 then + HeroManager.DetectionOpenFiveStarActivity(isOpenGeiSSRAvtivity) + end + end, 0.5):Start() + --在关卡界面获得装备 刷新下btview成员红点 + -- Game.GlobalEvent:DispatchEvent(GameEvent.Equip.EquipChange) end) + for i = #itemDataList, 1, -1 do + isPlayerAniEnd = false + local view = itemListPrefab[i] + local curItemData=itemDataList[i] + view:OnOpen(true,curItemData,1.15,true,true,false,self.sortingOrder) + view.gameObject:SetActive(false) + callList:Push(function () + local func = function() + view.gameObject:SetActive(true) + local btn = Util.GetGameObject(view.gameObject, "item/frame"):GetComponent("Button") + btn.enabled = false + PlayUIAnim(view.gameObject, function() + btn.enabled = true + end) + --改为后端更新 + --this.SetItemData2(itemDataList[i]) + Timer.New(function () + isPopGetSSR = false + callList:Pop()() + end, 0.05):Start() + end + if curItemData.configData and curItemData.itemType==3 and curItemData.configData.Quality == 5 then + HeroManager.DetectionOpenFiveStarActivity(curItemData.configData.Star) + end + if curItemData.configData and curItemData.itemType==3 and curItemData.configData.Quality == 5 and showHero then + isPopGetSSR = true + isOpenGeiSSRAvtivity = curItemData.configData.Star + UIManager.OpenPanel(UIName.DropGetSSRHeroShopPanel,curItemData.backData, func) + elseif curItemData.configData and curItemData.itemType==1 and + (curItemData.configData.ItemType == ItemType.Title or curItemData.configData.ItemType == ItemType.Ride) then--皮肤 坐骑 + -- isPopGetSSR = true + -- UIManager.OpenPanel(UIName.DropGetPlayerDecorateShopPanel,curItemData.backData, func) + func() + else + func() + end + end) + end + callList:Pop()() + else + for i = 1, #itemDataList do + local view = itemListPrefab[i] + local curItemData=itemDataList[i] + view:OnOpen(true,curItemData,1.15,true,true,false,self.sortingOrder) + view.gameObject:SetActive(true) + end end - callList:Pop()() + end --存储本地 function this.SetItemData2(itemdata) @@ -452,6 +477,9 @@ function RewardItemPopup:OnClose() end --检测是否需要弹每日任务飘窗 TaskManager.RefreshShowDailyMissionTipPanel() +end +--界面销毁时调用(用于子类重写) +function RewardItemPopup:OnDestroy() if #itemListPrefab > 0 then for i = 1, #itemListPrefab do destroy(itemListPrefab[i].gameObject) @@ -460,7 +488,4 @@ function RewardItemPopup:OnClose() itemListPrefab = {} itemDataList = {} end ---界面销毁时调用(用于子类重写) -function RewardItemPopup:OnDestroy() -end return RewardItemPopup \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua index a83a252a91..44d113a814 100644 --- a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua @@ -433,7 +433,7 @@ function this.SingleItemDataShow2(go, data,curShopDataId) end) end function this.SingleItemDataShow(go, data) - if not curServerTaskList[data.Id] then return end + if not data or not curServerTaskList[data.Id] then return end local curServerTask = curServerTaskList[data.Id] if not itemList[go.name] then itemList[go.name] = {} diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoRewardPreviewPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoRewardPreviewPanel.lua index 0f93b24b81..67f05f93aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoRewardPreviewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoRewardPreviewPanel.lua @@ -28,17 +28,17 @@ end --界面打开时调用(用于子类重写) function this:OnOpen(...) + + +end + +function this:OnShow() local rewardList=ConfigManager.GetConfigDataByKey(ConfigName.FreeTravel,"MapID",XiaoYaoManager.curMapId).Exhibition for i = 1, #rewardList do Log(rewardList[i]) local _rewardObj= SubUIManager.Open(SubUIConfig.ItemView, this.grid.transform) _rewardObj:OnOpen(false, {rewardList[i]}, 1,true) end - -end - -function this:OnShow() - end --界面关闭时调用(用于子类重写)