From 7c92ddc60acd045b6147d8a5ae83ab305e13b7c5 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 25 Jul 2020 18:35:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=AF=E6=9C=AC=E7=BD=AE=E7=81=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + .../~Lua/Modules/Carbon/CarbonTypePanelV2.lua | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f8306207b7..d10c2d902d 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1201,6 +1201,7 @@ FUNCTION_OPEN_TYPE = { DAILYCHALLENGE_HERODEBRIS=69,--每日角色碎片副本 DAILYCHALLENGE_TALISMAN=70,--每日法宝副本 DAILYCHALLENGE_SOULPRINT=71,--每日魂印副本 + CARDELAY = 73, PEOPLE_MIRROR=74,--人杰宝镜 BUDDHIST_MIRROR=75,--佛禅宝镜 MAGIC_MIRROR=76,--妖灵宝镜 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index 2d234e72aa..c6e123d556 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -36,7 +36,7 @@ local type = { liveSize = Vector2(1024, 1145) }, [4] = { - id = 46, --车迟斗法 + id = FUNCTION_OPEN_TYPE.CARDELAY, --车迟斗法 bg = "r_Dungeon_rendi_04", name = "r_Dungeon_chechidoufa", live = "m_syjm_0026_png", @@ -274,7 +274,7 @@ function this.BtnClick(id) PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.EXPEDITION)) end end - elseif id == 46 then + elseif id == FUNCTION_OPEN_TYPE.CARDELAY then if PlayerManager.familyId == 0 then PopupTipPanel.ShowTip(Language[10327]) return