diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 37bffb23b6..173deb21d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -110,11 +110,7 @@ local carbonData = { id = FUNCTION_OPEN_TYPE.GodsWayTower_1, --多队塔 objName = "other", nameImg = "f_fuben_fubenming_08", -<<<<<<< HEAD name="天梯战", -======= - name="破坏神试炼", ->>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51 titleBg="UI_hz_fb_08", btnPos = Vector2(-78,66), redPointType = RedPointType.godsWayTower,