From 9763762e883f3c0b080eff498cc41f9b35daa362 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 24 Oct 2020 19:31:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivity/DynamicActivityPanel.lua | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index 7dbc01aaec..9dc9cec164 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -47,31 +47,35 @@ local tabs = { default = "s_shibukedang_bicon1", lock = "s_shibukedang_bicon1", select = "s_shibukedang_bicon2", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [11] = { --限时召唤 + [11] = { --社稷大典 + default = "r_guanka_sheji_anniu_02", lock = "r_guanka_sheji_anniu_02", select = "r_guanka_sheji_anniu_01", + rpType = RedPointType.Celebration,panelType = PanelType.Celebration,ActType = ActivityTypeDef.Celebration + }, + [12] = { --限时召唤 default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01", rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,ActType = ActivityTypeDef.FindFairy }, - [12] = { --乾坤宝盒 + [13] = { --乾坤宝盒 default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01", rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,ActType = ActivityTypeDef.QianKunBox }, - [13] = { --珍奇礼包 + [14] = { --珍奇礼包 default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01", rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_Treasure }, - [14] = { --累计充值 一天一刷 + [15] = { --累计充值 一天一刷 default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu", rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.AccumulativeRechargeExper }, - [15] = { --累计充值 一周一刷 + [16] = { --累计充值 一周一刷 default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu", rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_recharge }, - [16] = { --限时商市 + [17] = { --限时商市 default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01", rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_TimeLimitShop }, - [17] = { --限时兑换 + [18] = { --限时兑换 default = "r_xianshiduihuan_anniu_01", lock = "r_xianshiduihuan_anniu_01", select = "r_xianshiduihuan_anniu", rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.LimitExchange }, @@ -91,9 +95,10 @@ local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表 [12] = 3, [13] = 4, [14] = 5, - [15] = 5, + [15] = 6, [16] = 6, [17] = 7, + [18] = 8, } local TimeLimitedCall = require("Modules/DynamicActivity/TimeLimitedCall") @@ -102,6 +107,7 @@ local DynamicActPage=require("Modules/DynamicActivity/DynamicTaskPage") local ZhenQiYiBaoPage=require("Modules/DynamicActivity/ZhenQiYiBaoPage") local LeiJiChongZhiPage=require("Modules/DynamicActivity/LeiJiChongZhiPage") local XianShiShangShi=require("Modules/DynamicActivity/XianShiShangShi") +local SheJiDaDian=require("Modules/DynamicActivity/SheJiDaDian") local XianShiDuiHuan=require("Modules/Expert/DynamicActivityExChange") --初始化组件(用于子类重写) @@ -113,12 +119,13 @@ function DynamicActivityPanel:InitComponent() this.PageList = { [1] = DynamicActPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")), - [2] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")), - [3] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")), - [4] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")), - [5] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")), - [6] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")), - [7] = XianShiDuiHuan.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_7")), + [2] = SheJiDaDian.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_8")), + [3] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")), + [4] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")), + [5] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")), + [6] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")), + [7] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")), + [8] = XianShiDuiHuan.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_7")), } -- 上部货币显示