From 3bc06e9b8ef8b928aaf766be3faa3a9faf289a48 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 13 Dec 2021 10:14:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E7=99=BD=E9=87=91=E8=A3=85?= =?UTF-8?q?=E5=A4=87=E3=80=91=E8=A3=85=E5=A4=87=E7=A9=BF=E6=88=B4=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=9B=9B=E6=98=9F=E7=99=BD=E9=87=91=E8=A3=85?= =?UTF-8?q?=E5=A4=87=E6=AF=94=E4=BA=94=E6=98=9F=E7=99=BD=E9=87=91=E8=A3=85?= =?UTF-8?q?=E5=A4=87=E6=8E=92=E5=BA=8F=E9=9D=A0=E5=89=8D=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E9=83=A8=E4=BD=8D=E6=B2=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 22db651228..f25ef68e7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -1155,7 +1155,7 @@ function this:SortEquipDatas(_equipDatas) if a.isRedPointShow == b.isRedPointShow then if a.itemConfig.Quantity == b.itemConfig.Quantity then if equipConfig[a.id].Position == equipConfig[b.id].Position then - return a.id > b.id + return itemConfig[a.id].Sort > itemConfig[b.id].Sort else return equipConfig[a.id].Position < equipConfig[b.id].Position end From 6e92bbd0826480e5b7fe19712486741e777d0f87 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 13 Dec 2021 11:04:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E7=BA=A2=E7=82=B9=E3=80=91?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=B4=BB=E5=8A=A8=E5=85=A5=E5=8F=A3=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=BA=A2=E7=82=B9=EF=BC=8C=E7=AD=BE=E5=88=B0=E5=90=8E?= =?UTF-8?q?=E6=88=96=E9=A2=86=E8=BE=BE=E4=BA=BA=E6=B4=BB=E5=8A=A8=E5=A5=96?= =?UTF-8?q?=E5=8A=B1=E5=90=8E=EF=BC=8C=E7=BA=A2=E7=82=B9=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 2 +- .../ActivityGift/ActivityGiftManager.lua | 2 +- .../ActivityGift/AllActivityManager.lua | 2 +- .../DynamicActivity/DynamicActivityPanel.lua | 312 +++++++++--------- .../DynamicActivity/DynamicTaskPage.lua | 3 +- .../~Lua/Modules/Player/RedpotManager.lua | 2 +- 6 files changed, 162 insertions(+), 161 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f99f5b57b7..427bd131fd 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -690,7 +690,7 @@ RedPointType = { DynamicAct = 2017,--破阵诛仙 DynamicActTask_MeiRi = 20169,--破阵诛仙每日任务 DynamicActTask_MeiZhou = 20170,--破阵诛仙每周任务 - DynamicActTask = 20171,--破阵诛仙任务 + -- DynamicActTask = 20171,--破阵诛仙任务 DynamicActRecharge = 20172,--破阵诛仙累充 WeekGiftPage = 2018, -- 每周礼包 MonthGiftPage = 2019, -- 每月礼包 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index ec2cefb8ed..6923562dd4 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -577,7 +577,7 @@ function this.RefreshActivityRedPoint() -- CheckRedPointStatus(RedPointType.FindFairy_OneView) -- CheckRedPointStatus(RedPointType.FindFairy_ThreeView) -- CheckRedPointStatus(RedPointType.FindFairy_FourView) - CheckRedPointStatus(RedPointType.DynamicActTask) + -- CheckRedPointStatus(RedPointType.DynamicActTask) CheckRedPointStatus(RedPointType.QinglongSerectTreasure) CheckRedPointStatus(RedPointType.chaofanrushengRed) CheckRedPointStatus(RedPointType.jijin128) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua index 1f99e02933..eddbdfe14f 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua @@ -154,7 +154,7 @@ function this.RefreshActivityRedPoint() -- CheckRedPointStatus(RedPointType.FindFairy_OneView) -- CheckRedPointStatus(RedPointType.FindFairy_ThreeView) -- CheckRedPointStatus(RedPointType.FindFairy_FourView) - CheckRedPointStatus(RedPointType.DynamicActTask) + -- CheckRedPointStatus(RedPointType.DynamicActTask) CheckRedPointStatus(RedPointType.QinglongSerectTreasure) end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index 05238e29c1..2368889d8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -7,162 +7,162 @@ local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity) local _CurPageIndex =1 local orginLayer local tabs = { - [1] = { --第二周 破阵诛仙 - default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [2] = { --第三周 勇冠三军 - default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [3] = { --第四周 叱咤风云 - default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [4] = { --第五周 丹心碧血 - default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [5] = { --第六周 势不可挡 - default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [6] = { --第七周 勇往直前 - default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [7] = { --第八周 运筹帷幄 - default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [8] = { --第九周 移山倒海 - default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [9] = { --第十周 玄机妙算 - default = "x_xuanjimiaosuan_icon2_zh", lock = "x_xuanjimiaosuan_icon2_zh", select = "x_xuanjimiaosuan_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [10] = { --第十一周 降龙伏虎 - default = "x_xianglongfuhu_icon2_zh", lock = "x_xianglongfuhu_icon2_zh", select = "x_xianglongfuhu_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [11] = { --第十二周 旗开得胜 - default = "q_qikaidesheng_icon2_zh", lock = "q_qikaidesheng_icon2_zh", select = "q_qikaidesheng_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [12] = { --第十三周 变幻莫测 - default = "b_bianhuanmoce_icon2_zh", lock = "b_bianhuanmoce_icon2_zh", select = "b_bianhuanmoce_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [13] = { --第十四周 博文多识 - default = "b_bowenduoshi_icon2_zh", lock = "b_bowenduoshi_icon2_zh", select = "b_bowenduoshi_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [14] = { --第十五周 天相几人 - default = "t_tianxiangjiren_icon2_zh", lock = "t_tianxiangjiren_icon2_zh", select = "t_tianxiangjiren_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [15] = { --第十六周 所向披靡 - default = "s_suoxiangpimi_icon2_zh", lock = "s_suoxiangpimi_icon2_zh", select = "s_suoxiangpimi_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [16] = { --第十七周 狭路相逢 - default = "x_xialuxiangfeng_icon2_zh", lock = "x_xialuxiangfeng_icon2_zh", select = "x_xialuxiangfeng_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [17] = { --第十八周 铜墙铁壁 - default = "t_tongqiangtiebi_icon2_zh", lock = "t_tongqiangtiebi_icon2_zh", select = "t_tongqiangtiebi_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [18] = { --第二周 破阵诛仙 - default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [19] = { --第三周 勇冠三军 - default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [20] = { --第四周 叱咤风云 - default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [21] = { --第五周 丹心碧血 - default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [22] = { --第六周 势不可挡 - default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [23] = { --第七周 勇往直前 - default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [24] = { --第八周 运筹帷幄 - default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [25] = { --第九周 移山倒海 - default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [26] = { --第十周 玄机妙算 - default = "x_xuanjimiaosuan_icon2_zh", lock = "x_xuanjimiaosuan_icon2_zh", select = "x_xuanjimiaosuan_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [27] = { --第十一周 降龙伏虎 - default = "x_xianglongfuhu_icon2_zh", lock = "x_xianglongfuhu_icon2_zh", select = "x_xianglongfuhu_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [28] = { --第十四周 博闻强识 - default = "b_bowenduoshi_icon2_zh", lock = "b_bowenduoshi_icon2_zh", select = "b_bowenduoshi_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [29] = { --第十五周 天相几人 - default = "t_tianxiangjiren_icon2_zh", lock = "t_tianxiangjiren_icon2_zh", select = "t_tianxiangjiren_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [30] = { --第十六周 所向披靡 - default = "s_suoxiangpimi_icon2_zh", lock = "s_suoxiangpimi_icon2_zh", select = "s_suoxiangpimi_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [31] = { --第十七周 狭路相逢 - default = "x_xialuxiangfeng_icon2_zh", lock = "x_xialuxiangfeng_icon2_zh", select = "x_xialuxiangfeng_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [32] = { --第十八周 铜墙铁壁 - default = "t_tongqiangtiebi_icon2_zh", lock = "t_tongqiangtiebi_icon2_zh", select = "t_tongqiangtiebi_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [33] = { --第二周 破阵诛仙 - default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [34] = { --第三周 勇冠三军 - default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [35] = { --第四周 叱咤风云 - default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [36] = { --第六周 势不可挡 - default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [37] = { --第七周 勇往直前 - default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [38] = { --第八周 运筹帷幄 - default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, - [39] = { --第九周 移山倒海 - default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh", - rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct - }, + -- [1] = { --第二周 破阵诛仙 + -- default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [2] = { --第三周 勇冠三军 + -- default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [3] = { --第四周 叱咤风云 + -- default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [4] = { --第五周 丹心碧血 + -- default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [5] = { --第六周 势不可挡 + -- default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [6] = { --第七周 勇往直前 + -- default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [7] = { --第八周 运筹帷幄 + -- default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [8] = { --第九周 移山倒海 + -- default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [9] = { --第十周 玄机妙算 + -- default = "x_xuanjimiaosuan_icon2_zh", lock = "x_xuanjimiaosuan_icon2_zh", select = "x_xuanjimiaosuan_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [10] = { --第十一周 降龙伏虎 + -- default = "x_xianglongfuhu_icon2_zh", lock = "x_xianglongfuhu_icon2_zh", select = "x_xianglongfuhu_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [11] = { --第十二周 旗开得胜 + -- default = "q_qikaidesheng_icon2_zh", lock = "q_qikaidesheng_icon2_zh", select = "q_qikaidesheng_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [12] = { --第十三周 变幻莫测 + -- default = "b_bianhuanmoce_icon2_zh", lock = "b_bianhuanmoce_icon2_zh", select = "b_bianhuanmoce_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [13] = { --第十四周 博文多识 + -- default = "b_bowenduoshi_icon2_zh", lock = "b_bowenduoshi_icon2_zh", select = "b_bowenduoshi_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [14] = { --第十五周 天相几人 + -- default = "t_tianxiangjiren_icon2_zh", lock = "t_tianxiangjiren_icon2_zh", select = "t_tianxiangjiren_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [15] = { --第十六周 所向披靡 + -- default = "s_suoxiangpimi_icon2_zh", lock = "s_suoxiangpimi_icon2_zh", select = "s_suoxiangpimi_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [16] = { --第十七周 狭路相逢 + -- default = "x_xialuxiangfeng_icon2_zh", lock = "x_xialuxiangfeng_icon2_zh", select = "x_xialuxiangfeng_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [17] = { --第十八周 铜墙铁壁 + -- default = "t_tongqiangtiebi_icon2_zh", lock = "t_tongqiangtiebi_icon2_zh", select = "t_tongqiangtiebi_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [18] = { --第二周 破阵诛仙 + -- default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [19] = { --第三周 勇冠三军 + -- default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [20] = { --第四周 叱咤风云 + -- default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [21] = { --第五周 丹心碧血 + -- default = "d_danxinbixue_icon2_zh", lock = "d_danxinbixue_icon2_zh", select = "d_danxinbixue_bicon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [22] = { --第六周 势不可挡 + -- default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [23] = { --第七周 勇往直前 + -- default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [24] = { --第八周 运筹帷幄 + -- default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [25] = { --第九周 移山倒海 + -- default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [26] = { --第十周 玄机妙算 + -- default = "x_xuanjimiaosuan_icon2_zh", lock = "x_xuanjimiaosuan_icon2_zh", select = "x_xuanjimiaosuan_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [27] = { --第十一周 降龙伏虎 + -- default = "x_xianglongfuhu_icon2_zh", lock = "x_xianglongfuhu_icon2_zh", select = "x_xianglongfuhu_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [28] = { --第十四周 博闻强识 + -- default = "b_bowenduoshi_icon2_zh", lock = "b_bowenduoshi_icon2_zh", select = "b_bowenduoshi_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [29] = { --第十五周 天相几人 + -- default = "t_tianxiangjiren_icon2_zh", lock = "t_tianxiangjiren_icon2_zh", select = "t_tianxiangjiren_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [30] = { --第十六周 所向披靡 + -- default = "s_suoxiangpimi_icon2_zh", lock = "s_suoxiangpimi_icon2_zh", select = "s_suoxiangpimi_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [31] = { --第十七周 狭路相逢 + -- default = "x_xialuxiangfeng_icon2_zh", lock = "x_xialuxiangfeng_icon2_zh", select = "x_xialuxiangfeng_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [32] = { --第十八周 铜墙铁壁 + -- default = "t_tongqiangtiebi_icon2_zh", lock = "t_tongqiangtiebi_icon2_zh", select = "t_tongqiangtiebi_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [33] = { --第二周 破阵诛仙 + -- default = "p_pozhengzhuxian_anniu_02_zh", lock = "p_pozhengzhuxian_anniu_02_zh", select = "p_pozhengzhuxian_anniu_01_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [34] = { --第三周 勇冠三军 + -- default = "c_ydsj_anniu_02_zh", lock = "c_ydsj_anniu_02_zh", select = "c_ydsj_anniu_01_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [35] = { --第四周 叱咤风云 + -- default = "c_ccfy_icon2_zh", lock = "c_ccfy_icon2_zh", select = "c_ccfy_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [36] = { --第六周 势不可挡 + -- default = "s_shibukedang_bicon1_zh", lock = "s_shibukedang_bicon1_zh", select = "s_shibukedang_bicon2_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [37] = { --第七周 勇往直前 + -- default = "s_yongwangzhiqian_icon2_zh", lock = "s_yongwangzhiqian_icon2_zh", select = "s_yongwangzhiqian_icon1_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [38] = { --第八周 运筹帷幄 + -- default = "y_yunchouweiwo_anniu02_zh", lock = "y_yunchouweiwo_anniu02_zh", select = "y_yunchouweiwo_anniu01_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, + -- [39] = { --第九周 移山倒海 + -- default = "y_yishandaohai_anniu_02_zh", lock = "y_yishandaohai_anniu_02_zh", select = "y_yishandaohai_anniu_01_zh", + -- rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct + -- }, [40] = { --社稷大典 default = "r_guanka_sheji_anniu_02_zh", lock = "r_guanka_sheji_anniu_02_zh", select = "r_guanka_sheji_anniu_01_zh", rpType = RedPointType.Celebration,panelType = PanelType.Celebration,ActType = ActivityTypeDef.Celebration diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index a5921c5588..005fbc9f53 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -266,7 +266,8 @@ function this.SingleDataShow(pre,value) NetManager.TakeMissionRewardRequest(TaskTypeDef.DynamicActTask,sConFigData.id, function(respond) UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1,function () this.Refresh(false,false) - CheckRedPointStatus(RedPointType.DynamicActTask) + CheckRedPointStatus(RedPointType.DynamicActTask_MeiRi) + CheckRedPointStatus(RedPointType.DynamicActTask_MeiZhou) end) end) elseif state == 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 72c1916757..a0b1fedacb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -502,7 +502,7 @@ function this.RegisterRedCheckFunc() -- RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus) RPData:AddCheckFunc(RedPointType.TimeLimitWish,OperatingManager.GetWishDrawRedPointStatus) RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus) - RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed) + -- RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed) RPData:AddCheckFunc(RedPointType.DynamicActTask_MeiRi, OperatingManager.CheckDynamicActTaskRed) RPData:AddCheckFunc(RedPointType.DynamicActTask_MeiZhou, OperatingManager.CheckDynamicActTaskRed) RPData:AddCheckFunc(RedPointType.DynamicActRecharge, OperatingManager.CheckLeiJiChongZhiRedData) From 52937f3a6781b89f93fc505bef8e73c4cd4334b0 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 13 Dec 2021 11:50:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E6=95=88=E6=9E=9C133=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B2=BB?= =?UTF-8?q?=E7=96=97=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Effect.lua | 3 +++ .../Modules/Battle/Logic/Misc/BattleUtil.lua | 22 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index f41a79f475..0a6268f360 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -2552,6 +2552,9 @@ local effectList = { BattleUtil.FinalDamageCountShield(nil,caster, target,damage) local hp=floor(damage*f2) local arr = RoleManager.NoOrder(function (r) return r.camp == caster.camp end,false,true) + if arr==nil or #arr==0 then + return + end BattleUtil.SortByHpFactor(arr,sort) BattleUtil.CalTreatNoCrit(caster, arr[1],hp,1,skill) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 9b2cbe10e9..0fcc694281 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -448,6 +448,7 @@ function BattleUtil.ChooseTarget(role, chooseId) --LogError(aaa.position) end aaa.isRealDead=false + arr={} table.insert(arr,aaa) -- return aaa end @@ -1073,6 +1074,9 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i end function BattleUtil.CalTreat(castRole, targetRole, value, baseFactor,skill) + if targetRole==nil then + return + end -- 灵兽无效 if targetRole.type == BattleUnitType.Monster or targetRole.type == BattleUnitType.Player then return @@ -1106,6 +1110,9 @@ end --没有暴击得治疗 function BattleUtil.CalTreatNoCrit(castRole, targetRole, value, baseFactor,skill) + if targetRole==nil then + return + end -- 灵兽无效 if targetRole==nil then return @@ -1135,6 +1142,9 @@ end function BattleUtil.FinalTreat(castRole, targetRole, value, baseFactor,skill) + if targetRole==nil then + return + end -- 灵兽无效 if targetRole.type == BattleUnitType.Monster or targetRole.type == BattleUnitType.Player then return @@ -1180,10 +1190,16 @@ end function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamageFactor,addDamageFactor,skill) + if targetRole==nil then + return + end -- 灵兽无效 if targetRole.type == BattleUnitType.Monster then return end + if addDamageFactor==nil then + addDamageFactor=1 + end BattleLogic.Event:DispatchEvent(BattleEventName.DisposeRoleCtrl_noheal, castRole,targetRole) if targetRole.ctrl_noheal or targetRole:IsDead() then --禁疗和死亡无法加血 --禁疗并且没有死亡的单位显示血量+0 不走后面代码,防止触发后面的被动 by:王振兴 2021/1/27 @@ -1193,6 +1209,7 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamag return end baseFactor = baseFactor or 1 + critDamageFactor = critDamageFactor or 1 local maxHp = targetRole:GetRoleData(RoleDataName.MaxHp) local hp = targetRole:GetRoleData(RoleDataName.Hp) @@ -1204,9 +1221,11 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamag targetRole.Event:DispatchEvent(BattleEventName.PassiveBeTreatedFactor, treatFactorFunc, castRole) local factor = castRole.isTeam and 1 or castRole:GetRoleData(RoleDataName.TreatFacter) --释放者为team则不计算治疗加成属性 + if factor==0 then + factor=1 + end local factor2 = targetRole:GetRoleData(RoleDataName.CureFacter) local baseTreat = BattleUtil.FP_Mul(value, baseFactor, factor, factor2,critDamageFactor,addDamageFactor) - --加入被动效果 local cl = {} local function treatingFunc(v, ct) @@ -1219,7 +1238,6 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamag targetRole.Event:DispatchEvent(BattleEventName.PassiveBeTreated, treatingFunc, castRole) baseTreat = BattleUtil.CountChangeList(baseTreat, cl) - -- 取整 local baseTreat = floor(baseTreat + 0.5) From ab5b654b7345525cb8b0e1fc74c2053813616834 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 13 Dec 2021 12:14:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E6=B3=95=E5=AE=9D=E8=81=9A?= =?UTF-8?q?=E7=81=B5=E3=80=91=E5=A2=9E=E5=8A=A0=E7=89=B9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TailsmanSoulView/TailsManSouPanel.prefab | 130 +++++++++++++++++- .../Modules/TailsManSoul/TailsManSouPanel.lua | 3 + 2 files changed, 131 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab index fa104cd123..f4100c93a9 100644 --- a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab @@ -47440,7 +47440,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -0.0000022442177, y: 50} + m_AnchoredPosition: {x: 0.000011590219, y: 50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 1, y: 0.5} --- !u!114 &455843809901100221 @@ -81391,7 +81391,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.00000011920929, y: 0.74999994} + m_AnchoredPosition: {x: 0, y: 0.75} m_SizeDelta: {x: -8, y: -6.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5820556875347599956 @@ -100891,6 +100891,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6788551056416428698} + - {fileID: 773915991517710749} m_Father: {fileID: 8463856118875763708} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -126407,3 +126408,128 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1001 &6649204014538633504 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7480441870429284241} + m_Modifications: + - target: {fileID: 6267664518521124994, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_Name + value: ui-fabao + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: be5fe01ae64af2e44a81c16cd8af411b, type: 3} +--- !u!224 &773915991517710749 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6267664518521125053, guid: be5fe01ae64af2e44a81c16cd8af411b, + type: 3} + m_PrefabInstance: {fileID: 6649204014538633504} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua index 84f14ab499..f5d3a2cf5b 100644 --- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua @@ -186,6 +186,7 @@ function TailsManSouPanel:SetSingleData(go,data,index) if not self.itemPreList[go] then self.itemPreList[go] = {} self.itemPreList[go].obj = Util.GetGameObject(go,"go") + self.itemPreList[go].effect = Util.GetGameObject(self.itemPreList[go].obj,"ui-fabao") self.itemPreList[go].bg = Util.GetGameObject(self.itemPreList[go].obj,"bg"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin self.itemPreList[go].tip = Util.GetGameObject(self.itemPreList[go].bg.transform,"slider/tip"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin self.itemPreList[go].mask1 = Util.GetGameObject(self.itemPreList[go].bg.transform,"slider/mask1"):GetComponent("Image") --根据品质变化的图片 f_fabaojuling_zhujiemianbaijin f_fabaojuling_zhujiemianhong f_fabaojuling_zhujiemianjin @@ -217,6 +218,7 @@ function TailsManSouPanel:SetSingleData(go,data,index) self.itemPreList[go].slider.value = self.itemPreList[go].data.lv/self.itemPreList[go].data.maxLv self.itemPreList[go].progress.text = self.itemPreList[go].data.lv.."/"..self.itemPreList[go].data.maxLv self.itemPreList[go].red.gameObject:SetActive(self:CheckRedPoint(self.itemPreList[go].data.trumpList)) + self.itemPreList[go].effect:SetActive(self.itemPreList[go].data.quality == 6) for i = 1,math.max(#data.trumpList,#self.itemPreList[go].iconList) do if not data.trumpList[i] then @@ -229,6 +231,7 @@ function TailsManSouPanel:SetSingleData(go,data,index) self.itemPreList[go].iconList[i].effectjin.gameObject:SetActive(data.trumpList[i].config.Quality == 5) end Util.SetParticleSortLayer(go,self.sortingOrder + 1) + Util.SetParticleSortLayer(self.itemPreList[go].effect,self.sortingOrder + 1) Util.AddOnceClick(go,function() UIManager.OpenPanel(UIName.TailsmanSoulMainPanel,self.itemPreList[go].data.id) end)