合并主分支

lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua

@@ -45,13 +45,19 @@ function BanDesk:Init()
     end)
 
     self.list_banItem.itemRenderer = function(index, obj)
+
         local data = self.BanData[index]
 
         local tex_name = obj:GetChild("tex_name")
         local list_BanedPlayers = obj:GetChild("list_BanedPlayers")
         local btn_del = obj:GetChild("btn_del")
         local btn_addBanItem = obj:GetChild("btn_addBanItem")
+
+        --tex_name.text = 
     end
+    -- 最后一个添加ban按钮
+    local addBanItem = self.list_banItem:AddItemFromPool()
+    --addBanItem
 end
 
 return BanDesk