diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index aed15c048d..cb4e586486 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -14,19 +14,19 @@ local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表 default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01", rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox, }, - -- [3] = { --破阵诛仙 - -- default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01", - -- rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.QianKunBox, - -- }, + [3] = { --破阵诛仙 + default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01", + rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.QianKunBox, + }, [4] = { --珍奇礼包 default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01", rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox, }, - -- [5] = { --累计充值 - -- default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu", - -- rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox, - -- } - [3] = { --限时商市 + [5] = { --累计充值 + default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu", + rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox, + }, + [6] = { --限时商市 default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01", rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox, }, @@ -36,7 +36,7 @@ local TimeLimitedCall = require("Modules/DynamicActivity/TimeLimitedCall") local QianKunBox = require("Modules/DynamicActivity/QianKunBox") local PoZhenZhuXianPage=require("Modules/DynamicActivity/PoZhenZhuXianPage") local ZhenQiYiBaoPage=require("Modules/DynamicActivity/ZhenQiYiBaoPage") --- local LeiJiChongZhiPage=require("Modules/DynamicActivity/LeiJiChongZhiPage") +local LeiJiChongZhiPage=require("Modules/DynamicActivity/LeiJiChongZhiPage") local XianShiShangShi=require("Modules/DynamicActivity/XianShiShangShi") --初始化组件(用于子类重写) @@ -49,10 +49,10 @@ function DynamicActivityPanel:InitComponent() this.PageList = { [1] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")), [2] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")), - -- [3] = PoZhenZhuXianPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")), + [3] = PoZhenZhuXianPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")), [4] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")), - -- [5] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")), - [3] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")), + [5] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")), + [6] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")), } -- 上部货币显示 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua index 369ba016f3..19f93c3492 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua @@ -101,7 +101,7 @@ function this.SingleDataShow(pre,value) end for i = 1, #shows do if itemsGrid[pre][i] then - itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder) + itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,sortingOrder) itemsGrid[pre][i].gameObject:SetActive(true) end end @@ -117,7 +117,7 @@ function this.SingleDataShow(pre,value) obj.gameObject:SetActive(true) end for i = 1, #shows do - itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder) + itemsGrid[pre][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,sortingOrder) itemsGrid[pre][i].gameObject:SetActive(true) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 2c8b31de80..b70905a5aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -40,9 +40,9 @@ function this.SetBasicValues(giftGoodsList) local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId) - LogGreen("------充值活动-----------礼包类型:".. rechargeConfig.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:" - ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:" - ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes) + -- LogGreen("------充值活动-----------礼包类型:".. rechargeConfig.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:" + -- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:" + -- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes) if giftGoodsInfoList[rechargeConfig.Type] then