diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua
index da205448..cef03abd 100644
--- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua
+++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua
@@ -105,6 +105,7 @@ function M:connect(host, groupId, callback)
group:clearPlay()
local play_list = res.Data.play_list
printlog("2222222222222222")
+ pt(res.Data)
pt(play_list)
for i = 1, #play_list do
local m = play_list[i]
diff --git a/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua b/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua
index 9e0fd2c6..0e2a0e8d 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua
@@ -45,13 +45,36 @@ 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")
+
+ btn_addBanItem.onClick:Set(function()
+ local fgCtr = ControllerManager.GetController(NewGroupController)
+ local groupId = root._group
+ local userId = DataManager.SelfUser.account_id
+ local banList = {}
+ --fgCtr:FG_SetBanTable(groupId, userId, , {},function()
+ --end)
+ end)
+
+ list_BanedPlayers.itemRenderer = function(i, o)
+
+ end
end
+
+end
+
+function BanDesk:Reflash()
+ -- 最后一个添加ban按钮
+ local addBanItem = self.list_banItem:AddItemFromPool()
+ addBanItem:GetController("cStyle").selectedIndex = 1
+
+ --addBanItem
end
return BanDesk
\ No newline at end of file
diff --git a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
new file mode 100644
index 00000000..8c9592f0
--- /dev/null
+++ b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
@@ -0,0 +1,34 @@
+local FamilyRecord = {}
+
+function FamilyRecord:TryShow(r)
+ if not self._view then
+ self:Init()
+ root = r
+ end
+
+ self:Show()
+end
+
+function FamilyRecord:Show()
+ BaseView.Show(self)
+end
+
+
+function FamilyRecord:Init()
+ setmetatable(FamilyRecord, {__index = BaseView})
+
+ self:InitView("ui://Family/com_Record")
+
+ local loader_test = self._view:GetChild("loader_test")
+
+ local btn_close = self._view:GetChild("btn_close")
+
+ btn_close.onClick:Set(function()
+ self:Close()
+ end)
+
+ ImageLoad.Load()
+ --self
+end
+
+return FamilyRecord
\ No newline at end of file
diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index 907f333c..bbe20d26 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/lua_probject/base_project/Game/View/FamilyView.lua
@@ -11,6 +11,7 @@ local FamilyJoinAndCreate = import(".Family.FamilyJoinAndCreate")
local FamilyEventView = import(".Family.FamilyEventView")
local FamilyBanDesk = import(".Family.FamilyBanDesk")
local FamilyMyFamily = import(".Family.FamilyMyFamily")
+local FamilyRecord = import(".Family.FamilyRecord")
---
FamilyView = {}
@@ -86,6 +87,10 @@ function M:ShareWx()
familyInviteFamilyView:Show()
end
+function M:FamilyRecord()
+ FamilyRecord:TryShow(self)
+end
+
function M:CreateFamily(frist)
self.familyType.selectedIndex = 3
if not frist then
@@ -472,7 +477,7 @@ local IDENTITY_LIST = {
},
{
name = "游戏记录",
- Fct = M.ShareWx
+ Fct = M.FamilyRecord
},
{
name = "玩法管理",
@@ -514,7 +519,7 @@ local IDENTITY_LIST = {
},
{
name = "游戏记录",
- Fct = M.ShareWx
+ Fct = M.FamilyRecord
},
{
name = "玩法管理",
diff --git a/wb_new_ui/assets/Family/BanDesk/Component/item_banItem.xml b/wb_new_ui/assets/Family/BanDesk/Component/item_banItem.xml
index 775f4fd2..7188fd8f 100644
--- a/wb_new_ui/assets/Family/BanDesk/Component/item_banItem.xml
+++ b/wb_new_ui/assets/Family/BanDesk/Component/item_banItem.xml
@@ -9,7 +9,7 @@
-
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Record/Component/Item_record.xml b/wb_new_ui/assets/Family/Record/Component/Item_record.xml
new file mode 100644
index 00000000..7183426c
--- /dev/null
+++ b/wb_new_ui/assets/Family/Record/Component/Item_record.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Record/Component/Item_score.xml b/wb_new_ui/assets/Family/Record/Component/Item_score.xml
new file mode 100644
index 00000000..4f893791
--- /dev/null
+++ b/wb_new_ui/assets/Family/Record/Component/Item_score.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Record/Component/Item_title.xml b/wb_new_ui/assets/Family/Record/Component/Item_title.xml
new file mode 100644
index 00000000..fcf89382
--- /dev/null
+++ b/wb_new_ui/assets/Family/Record/Component/Item_title.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Record/Component/btn_replay.xml b/wb_new_ui/assets/Family/Record/Component/btn_replay.xml
new file mode 100644
index 00000000..a3c3e74b
--- /dev/null
+++ b/wb_new_ui/assets/Family/Record/Component/btn_replay.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Record/Component/btn_share.xml b/wb_new_ui/assets/Family/Record/Component/btn_share.xml
new file mode 100644
index 00000000..3040fa2c
--- /dev/null
+++ b/wb_new_ui/assets/Family/Record/Component/btn_share.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/BanDesk/Image/Group 544.png b/wb_new_ui/assets/Family/Record/Image/Group 544.png
similarity index 100%
rename from wb_new_ui/assets/Family/BanDesk/Image/Group 544.png
rename to wb_new_ui/assets/Family/Record/Image/Group 544.png
diff --git a/wb_new_ui/assets/Family/Record/Image/Rectangle 182.png b/wb_new_ui/assets/Family/Record/Image/Rectangle 182.png
new file mode 100644
index 00000000..47fc403d
Binary files /dev/null and b/wb_new_ui/assets/Family/Record/Image/Rectangle 182.png differ
diff --git a/wb_new_ui/assets/Family/Record/Image/Rectangle 187.png b/wb_new_ui/assets/Family/Record/Image/Rectangle 187.png
new file mode 100644
index 00000000..72cef700
Binary files /dev/null and b/wb_new_ui/assets/Family/Record/Image/Rectangle 187.png differ
diff --git a/wb_new_ui/assets/Family/BanDesk/Image/Rectangle 285.png b/wb_new_ui/assets/Family/Record/Image/Rectangle 285.png
similarity index 100%
rename from wb_new_ui/assets/Family/BanDesk/Image/Rectangle 285.png
rename to wb_new_ui/assets/Family/Record/Image/Rectangle 285.png
diff --git a/wb_new_ui/assets/Family/Record/Image/分享.png b/wb_new_ui/assets/Family/Record/Image/分享.png
new file mode 100644
index 00000000..8f6fa819
Binary files /dev/null and b/wb_new_ui/assets/Family/Record/Image/分享.png differ
diff --git a/wb_new_ui/assets/Family/Record/Image/回放.png b/wb_new_ui/assets/Family/Record/Image/回放.png
new file mode 100644
index 00000000..0c2a3b48
Binary files /dev/null and b/wb_new_ui/assets/Family/Record/Image/回放.png differ
diff --git a/wb_new_ui/assets/Family/Record/com_Record.xml b/wb_new_ui/assets/Family/Record/com_Record.xml
new file mode 100644
index 00000000..8532a129
--- /dev/null
+++ b/wb_new_ui/assets/Family/Record/com_Record.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/Record/temp_record.xml b/wb_new_ui/assets/Family/Record/temp_record.xml
deleted file mode 100644
index 083d70ca..00000000
--- a/wb_new_ui/assets/Family/Record/temp_record.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml
index a58bf3b2..29c571ed 100644
--- a/wb_new_ui/assets/Family/package.xml
+++ b/wb_new_ui/assets/Family/package.xml
@@ -234,9 +234,9 @@
-
-
-
+
+
+
@@ -255,6 +255,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png
index d488f043..2301ed20 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png
index a3e5f6d0..856ee576 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png differ