Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

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,--妖灵宝镜

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