From 3311a00b912d84cc4958b23a5d9ee6a89d5d779f Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 15 Jan 2022 13:25:48 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=A3=9E=E5=8D=87=E3=80=91=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3Dglobadefine=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 58cae6ad46..809f49a148 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1655,11 +1655,8 @@ FUNCTION_OPEN_TYPE = { ChouJiangRukou = 121,--限时招募,乾坤宝盒、灵兽宝阁入口 Explore = 123, Gem = 122,--命格 -<<<<<<< HEAD FlyUp = 125,--飞升 -======= HOMELAND = 124,--家园 浮生们 ->>>>>>> china/dev } TaskGetBtnIconDef = {