diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index 8569a3901f..4fd8bb2bd2 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -482,11 +482,8 @@ SubUIConfig = { RoleSkinLayout = { name = "RoleSkinLayout",assetName = "RoleSkinLayout",script = "Modules/RoleInfo/RoleSkinPanel" }, RoleStoryLayout = { name = "RoleStoryLayout",assetName = "RoleStoryLayout",script = "Modules/RoleInfo/RoleStoryLayout" }, RoleUpStarLayout = { name = "RoleUpStarLayout",assetName = "RoleUpStarLayout",script = "Modules/RoleInfo/RoleUpStarLayout" }, -<<<<<<< HEAD RoleFlyUpLayout = { name = "RoleFlyUpLayout",assetName = "RoleFlyUpLayout",script = "Modules/RoleInfo/RoleFlyUpLayout" }, -======= SingleExplorePlayerView = { name = "SingleExplorePlayerView",assetName = "SingleExplorePlayerView",script = "View/SingleExplorePlayerView" }, -- 挂机界面一个人 ->>>>>>> china/dev SingleFightPlayerView = { name = "SingleFightPlayerView",assetName = "SingleFightPlayerView",script = "View/SingleFightPlayerView" }, -- 挂机界面一个人 SingleStoryPlayerView = { name = "SingleStoryPlayerView",assetName = "SingleStoryPlayerView",script = "View/SingleStoryPlayerView" } , --剧情界面一个对象 PlayerTitle = {name = "PlayerTitle",assetName = "PlayerTitle",script = "View/PlayerTitle"},